[Bf-blender-cvs] [ad43262] master: BGE: Fix T45817 Convert curve object in group instance.
Porteries Tristan
noreply at git.blender.org
Mon Aug 17 16:58:29 CEST 2015
Commit: ad43262fdb6ac6f0cc01a56c1316912f3018d788
Author: Porteries Tristan
Date: Mon Aug 17 16:51:35 2015 +0200
Branches: master
https://developer.blender.org/rBad43262fdb6ac6f0cc01a56c1316912f3018d788
BGE: Fix T45817 Convert curve object in group instance.
Now group instance conversion allow unconverted object like curve, meta ball ect…
===================================================================
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 3d94b02..9664e2f 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;
More information about the Bf-blender-cvs
mailing list