summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-08-31 18:56:27 +0200
committerGitHub <noreply@github.com>2017-08-31 18:56:27 +0200
commit849d2e346204559f35f8f430b1c13c03d579a36e (patch)
tree6b8f11d541a8976e59b8ddd2b668e11a3fe4111c /editor
parentc12a1dc53e7fb5ecd449cba4ddff6fed0bcab1cc (diff)
parent3b6a65b1e488909058da0e8049b799c68b57047d (diff)
Merge pull request #10825 from toger5/fix_import_svg_scale
updated import settings loader to 'svg/scale' fixes: #10815
Diffstat (limited to 'editor')
-rw-r--r--editor/import/resource_importer_texture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp
index b0b8faf2db..ade3550daa 100644
--- a/editor/import/resource_importer_texture.cpp
+++ b/editor/import/resource_importer_texture.cpp
@@ -357,7 +357,7 @@ Error ResourceImporterTexture::import(const String &p_source_file, const String
bool force_rgbe = int(p_options["compress/hdr_mode"]) == 1;
bool hdr_as_srgb = p_options["process/HDR_as_SRGB"];
int normal = p_options["compress/normal_map"];
- float scale = p_options["scale"];
+ float scale = p_options["svg/scale"];
Ref<Image> image;
image.instance();