Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPorteries Tristan <republicthunderbolt9@gmail.com>2015-08-17 17:51:35 +0300
committerPorteries Tristan <republicthunderbolt9@gmail.com>2015-08-17 17:51:35 +0300
commitad43262fdb6ac6f0cc01a56c1316912f3018d788 (patch)
tree54e0eaead8db7dc17d8360f8412594126af260e4 /source/gameengine
parentcb7f7b9abd1a45e5fc80df60bb20c5f43e45ab5e (diff)
BGE: Fix T45817 Convert curve object in group instance.
Now group instance conversion allow unconverted object like curve, meta ball ect…
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 3d94b029d8b..9664e2f6d2d 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2055,14 +2055,13 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
converter,
libloading);
- /* Insert object to the constraint game object list
- * so we can check later if there is a instance in the scene or
- * an instance and its actual group definition. */
- convertedlist.insert((KX_GameObject*)gameobj->AddRef());
-
bool isInActiveLayer = false;
- if (gameobj)
- {
+ if (gameobj) {
+ /* Insert object to the constraint game object list
+ * so we can check later if there is a instance in the scene or
+ * an instance and its actual group definition. */
+ convertedlist.insert((KX_GameObject*)gameobj->AddRef());
+
/* macro calls object conversion funcs */
BL_CONVERTBLENDEROBJECT_SINGLE;