Merge pull request #309 from rsredsq/RED-ATOMIC-237

Fix for #237, using scale as double number to avoid float "noise"

Source/ToolCore/Assets/ModelImporter.cpp

@@ -43,7 +43,7 @@ void ModelImporter::SetDefaults()
 {
     AssetImporter::SetDefaults();
 
-    scale_ = 1.0f;
+    scale_ = 1.0;
     importAnimations_ = false;
     animationInfo_.Clear();
 
@@ -314,7 +314,7 @@ bool ModelImporter::LoadSettingsInternal(JSONValue& jsonRoot)
     SetDefaults();
 
     if (import.Get("scale").IsNumber())
-        scale_ = import.Get("scale").GetFloat();
+        scale_ = import.Get("scale").GetDouble();
 
     if (import.Get("importAnimations").IsBool())
         importAnimations_ = import.Get("importAnimations").GetBool();

Source/ToolCore/Assets/ModelImporter.h

@@ -60,8 +60,8 @@ public:
 
     virtual void SetDefaults();
 
-    float GetScale() { return scale_; }
-    void SetScale(float scale) {scale_ = scale; }
+    double GetScale() { return scale_; }
+    void SetScale(double scale) {scale_ = scale; }
 
     bool GetImportAnimations() { return importAnimations_; }
     void SetImportAnimations(bool importAnimations) { importAnimations_ = importAnimations; }
@@ -88,7 +88,7 @@ protected:
     virtual bool SaveSettingsInternal(JSONValue& jsonRoot);
 
 
-    float scale_;
+    double scale_;
     bool importAnimations_;
     Vector<SharedPtr<AnimationImportInfo>> animationInfo_;