diff options
| author | Clay John <claynjohn@gmail.com> | 2022-10-02 18:07:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 18:07:31 -0600 |
| commit | f2061f11fe797c9c8449d1f335d191f2cd288c53 (patch) | |
| tree | e3e6c33dca015b4a0efa6fee5d33927da8c555a3 | |
| parent | abf473e2d022accdd5b7aa21d3e0b934b6ec0523 (diff) | |
| parent | 3086b1b79d1ddbc73ad696dd1a49705bd34cacde (diff) | |
Merge pull request #66767 from jtnicholl/blend_visibility
Fix visibility filtering options for .blend imports
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_blend.cpp | 2 | ||||
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_blend.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index ab52761e17..f79731dd22 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -261,7 +261,7 @@ void EditorSceneFormatImporterBlend::get_import_options(const String &p_path, Li #define ADD_OPTION_ENUM(PATH, ENUM_HINT, VALUE) \ r_options->push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, SNAME(PATH), PROPERTY_HINT_ENUM, ENUM_HINT), VALUE)); - ADD_OPTION_ENUM("blender/nodes/visible", "Visible Only,Renderable,All", BLEND_VISIBLE_ALL); + ADD_OPTION_ENUM("blender/nodes/visible", "All,Visible Only,Renderable", BLEND_VISIBLE_ALL); ADD_OPTION_BOOL("blender/nodes/punctual_lights", true); ADD_OPTION_BOOL("blender/nodes/cameras", true); ADD_OPTION_BOOL("blender/nodes/custom_properties", true); diff --git a/modules/gltf/editor/editor_scene_importer_blend.h b/modules/gltf/editor/editor_scene_importer_blend.h index dd1c1b9889..a1485ff82e 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.h +++ b/modules/gltf/editor/editor_scene_importer_blend.h @@ -45,9 +45,9 @@ class EditorSceneFormatImporterBlend : public EditorSceneFormatImporter { public: enum { + BLEND_VISIBLE_ALL, BLEND_VISIBLE_VISIBLE_ONLY, - BLEND_VISIBLE_RENDERABLE, - BLEND_VISIBLE_ALL + BLEND_VISIBLE_RENDERABLE }; enum { BLEND_BONE_INFLUENCES_NONE, |