From ae3aa70f458756b4a4961d1946eafe7b0092cf24 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Fri, 19 Jul 2019 20:54:57 +0200
Subject: [PATCH] Build fix on linux.

---
 config.pyc                           | Bin 433 -> 433 bytes
 meshes/editor_import_collada_mdr.cpp |  12 +++++++++---
 meshes/editor_import_collada_mdr.h   |   3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/config.pyc b/config.pyc
index 69767a2ae39e729be133d5ebe72853155c52c79a..97991bdc5de44c6567fda9de250ab49dc8d71d12 100644
GIT binary patch
delta 17
YcmdnUypfrM`7<w9{d=X@jT|c(0W+}$&Hw-a

delta 17
YcmdnUypfrM`7<w9Yuf*qjT|c(0X0hoCjbBd

diff --git a/meshes/editor_import_collada_mdr.cpp b/meshes/editor_import_collada_mdr.cpp
index a912914..cf247c7 100644
--- a/meshes/editor_import_collada_mdr.cpp
+++ b/meshes/editor_import_collada_mdr.cpp
@@ -66,8 +66,10 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
 			if (mesh.is_valid()) {
 				Ref<MeshDataResource> mdr;
 				mdr.instance();
-
-				mdr->set_array(apply_transforms(mesh->surface_get_arrays(0), p_options));
+                
+                Array arrays = mesh->surface_get_arrays(0);
+                
+				mdr->set_array(apply_transforms(arrays, p_options));
 
 				n->queue_delete();
 
@@ -82,7 +84,11 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
 
 
 Array EditorImportColladaMdr::apply_transforms(Array &array, const Map<StringName, Variant> &p_options) {
-	Transform transform = Transform(Basis(p_options["rotation"]).scaled(p_options["scale"]), p_options["offset"]);
+    Vector3 offset = p_options["offset"];
+    Vector3 rotation = p_options["rotation"];
+    Vector3 scale = p_options["scale"];
+    
+	Transform transform = Transform(Basis(rotation).scaled(scale), offset);
 
 	Array verts = array.get(Mesh::ARRAY_VERTEX);
 
diff --git a/meshes/editor_import_collada_mdr.h b/meshes/editor_import_collada_mdr.h
index 081e5e3..86ab48f 100644
--- a/meshes/editor_import_collada_mdr.h
+++ b/meshes/editor_import_collada_mdr.h
@@ -8,6 +8,9 @@
 #include "scene/resources/mesh.h"
 #include "scene/3d/mesh_instance.h"
 #include "core/io/resource_saver.h"
+#include "core/array.h"
+#include "core/math/basis.h"
+#include "core/math/transform.h"
 
 #include "mesh_data_resource.h"
 #include "editor/import/editor_import_collada.h"