Add support for ".dae" (and others) to filepicker load filter.
* Brought llfilepicker.{cpp,h} up to speed with V3 by adding
FFLOAD_MODEL, FFLOAD_COLLADA, FFLOAD_SCRIPT, FFLOAD_DICTIONARY
However, note that we used FFLOAD_LSL, so I renamed their
FFLOAD_SCRIPT to FFLOAD_LSL and kept our way of filtering.
* Fixed the filter token that is sent to the plugin for
collada (from "dae" to "collada").
This commit is contained in:
@@ -147,9 +147,6 @@ void AIFilePicker::open(ELoadFilter filter, std::string const& default_path, std
|
||||
case FFLOAD_ANIM:
|
||||
mFilter = "anim";
|
||||
break;
|
||||
case FFLOAD_COLLADA:
|
||||
mFilter = "dae";
|
||||
break;
|
||||
#ifdef _CORY_TESTING
|
||||
case FFLOAD_GEOMETRY:
|
||||
mFilter = "geometry";
|
||||
@@ -164,6 +161,18 @@ void AIFilePicker::open(ELoadFilter filter, std::string const& default_path, std
|
||||
case FFLOAD_RAW:
|
||||
mFilter = "raw";
|
||||
break;
|
||||
case FFLOAD_MODEL:
|
||||
mFilter = "model";
|
||||
break;
|
||||
case FFLOAD_COLLADA:
|
||||
mFilter = "collada";
|
||||
break;
|
||||
case FFLOAD_LSL:
|
||||
mFilter = "lsl";
|
||||
break;
|
||||
case FFLOAD_DICTIONARY:
|
||||
mFilter = "dictionary";
|
||||
break;
|
||||
case FFLOAD_INVGZ:
|
||||
mFilter = "invgz";
|
||||
break;
|
||||
|
||||
@@ -43,10 +43,13 @@ enum ELoadFilter
|
||||
FFLOAD_WAV,
|
||||
FFLOAD_IMAGE,
|
||||
FFLOAD_ANIM,
|
||||
FFLOAD_COLLADA,
|
||||
FFLOAD_XML,
|
||||
FFLOAD_SLOBJECT,
|
||||
FFLOAD_RAW,
|
||||
FFLOAD_MODEL,
|
||||
FFLOAD_COLLADA,
|
||||
FFLOAD_LSL,
|
||||
FFLOAD_DICTIONARY,
|
||||
FFLOAD_INVGZ,
|
||||
FFLOAD_AO,
|
||||
FFLOAD_BLACKLIST
|
||||
@@ -66,11 +69,11 @@ enum ESaveFilter
|
||||
FFSAVE_J2C,
|
||||
FFSAVE_PNG,
|
||||
FFSAVE_JPEG,
|
||||
FFSAVE_LSL,
|
||||
FFSAVE_ANIMATN,
|
||||
FFSAVE_OGG,
|
||||
FFSAVE_NOTECARD,
|
||||
FFSAVE_GESTURE,
|
||||
FFSAVE_LSL,
|
||||
FFSAVE_SHAPE,
|
||||
FFSAVE_SKIN,
|
||||
FFSAVE_HAIR,
|
||||
|
||||
Reference in New Issue
Block a user