From 57673614d43351a8714d8c47f2dfbf8451ecdc34 Mon Sep 17 00:00:00 2001 From: oakes Date: Wed, 21 May 2014 22:18:10 -0400 Subject: [PATCH] Allow ModelInstance constructors to work --- src/play_clj/g3d.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/play_clj/g3d.clj b/src/play_clj/g3d.clj index 4d72be7..9db52d6 100644 --- a/src/play_clj/g3d.clj +++ b/src/play_clj/g3d.clj @@ -86,9 +86,9 @@ (cond (string? arg1#) (ModelInstance. (model* arg1#)) - (:object arg1#) - (ModelInstance. ^ModelInstance (:object arg1#)) - (isa? arg1# ModelData) + (isa? (type arg1#) ModelEntity) + (ModelInstance. (. ^ModelInstance (:object arg1#) model) ~@(rest args)) + (isa? (type arg1#) ModelData) (ModelInstance. ^Model (Model. ~@args)) :else (ModelInstance. ~@args)))))