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-10 23:42:52 +0300
committerPorteries Tristan <republicthunderbolt9@gmail.com>2015-08-11 12:30:23 +0300
commitbccc6c393c70cc6466f044917348fb50d43ef021 (patch)
tree8e86ea5bff17a3223adf6248a2bb37b9381f14d7 /source/gameengine/Converter
parentc1506454ecb4630119ed7ce13b3f8cdfef6dcee0 (diff)
BGE: Fix T33187 constraints replication for libloaded objects.
Reviewers: Moguri
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 2de3ea0a87c..3d94b029d8b 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2318,7 +2318,13 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
/* Store constraints of grouped and instanced objects for all layers */
gameobj->AddConstraint(dat);
-
+
+ /** if it's during libload we only add constraints in the object but
+ * doesn't create it. Constraint will be replicated later in scene->MergeScene
+ */
+ if (libloading)
+ continue;
+
/* Skipped already converted constraints.
* This will happen when a group instance is made from a linked group instance
* and both are on the active layer. */