Browse Source

Merge pull request #174 from AtomicGameEngine/JME-FIX-INSPECTORTRANSFORM

Fix for inspector transform editing
JoshEngebretson 10 years ago
parent
commit
1fa726b933
1 changed files with 10 additions and 8 deletions
  1. 10 8
      Source/AtomicJS/Javascript/JSAPI.cpp

+ 10 - 8
Source/AtomicJS/Javascript/JSAPI.cpp

@@ -249,14 +249,6 @@ void js_to_variant(duk_context* ctx, int variantIdx, Variant &v)
         return;
         return;
     }
     }
 
 
-    if (duk_is_object(ctx, variantIdx))
-    {
-        RefCounted* o = js_to_class_instance<RefCounted>(ctx, variantIdx, 0);
-        if (o)
-            v = o;
-        return;
-    }
-
     if (duk_is_array(ctx, variantIdx))
     if (duk_is_array(ctx, variantIdx))
     {
     {
         if (duk_get_length(ctx, variantIdx) == 2)
         if (duk_get_length(ctx, variantIdx) == 2)
@@ -303,6 +295,16 @@ void js_to_variant(duk_context* ctx, int variantIdx, Variant &v)
         return;
         return;
     }
     }
 
 
+    // object check after array
+    if (duk_is_object(ctx, variantIdx))
+    {
+        RefCounted* o = js_to_class_instance<RefCounted>(ctx, variantIdx, 0);
+        if (o)
+            v = o;
+        return;
+    }
+
+
 }
 }