diff options
| author | Juan Linietsky | 2017-12-17 15:47:50 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-12-17 15:48:24 -0300 |
| commit | 3de20641f5690aba7551da5c592a79d44af54fef (patch) | |
| tree | 0c40980aa018008fbdf2c319a6473d6b452ad275 /editor/import/resource_importer_scene.cpp | |
| parent | f5b183d5252fd364c47c8453c7e5fdd90d723b10 (diff) | |
| download | godot-3de20641f5690aba7551da5c592a79d44af54fef.tar.gz godot-3de20641f5690aba7551da5c592a79d44af54fef.tar.zst godot-3de20641f5690aba7551da5c592a79d44af54fef.zip | |
Property install export templates when downloaded from http
added a scale parameter for scene import
Diffstat (limited to '')
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 77820bf6a..b6e472935 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -1037,6 +1037,7 @@ void ResourceImporterScene::get_import_options(List<ImportOption> *r_options, in bool scenes_out = p_preset == PRESET_MULTIPLE_SCENES || p_preset == PRESET_MULTIPLE_SCENES_AND_MATERIALS; bool animations_out = p_preset == PRESET_SEPARATE_ANIMATIONS || p_preset == PRESET_SEPARATE_MESHES_AND_ANIMATIONS || p_preset == PRESET_SEPARATE_MATERIALS_AND_ANIMATIONS || p_preset == PRESET_SEPARATE_MESHES_MATERIALS_AND_ANIMATIONS; + r_options->push_back(ImportOption(PropertyInfo(Variant::REAL, "nodes/root_scale", PROPERTY_HINT_RANGE, "0.001,1000,0.001"), 1.0)); r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/custom_script", PROPERTY_HINT_FILE, script_ext_hint), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "nodes/storage", PROPERTY_HINT_ENUM, "Single Scene,Instanced Sub-Scenes"), scenes_out ? 1 : 0)); r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "materials/location", PROPERTY_HINT_ENUM, "Node,Mesh"), (meshes_out || materials_out) ? 1 : 0)); @@ -1209,6 +1210,11 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p } } + if (Object::cast_to<Spatial>(scene)) { + float root_scale = p_options["nodes/root_scale"]; + Object::cast_to<Spatial>(scene)->scale(Vector3(root_scale, root_scale, root_scale)); + } + scene->set_name(p_options["nodes/root_name"]); err = OK; |