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:
authorErwin Coumans <blender@erwincoumans.com>2007-01-07 07:54:29 +0300
committerErwin Coumans <blender@erwincoumans.com>2007-01-07 07:54:29 +0300
commitf4ee0f4b4cac01c46ecc6857d401070066a64ac9 (patch)
tree345853e6c9ef6923499bd21efd93f156f2c78546 /source/gameengine/Converter
parent4a70681ce21d254f3bf7033380ec33732be2825d (diff)
fixes in rigidbody constraints rigidbody -> IPO baking:
copy system with rigidbody constraint will link new constraints to new objects (instead of old) fps from blender will be used when baking (left shift/ctrl/alt + P)
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 840df144778..0d9ad087c05 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1868,8 +1868,15 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
rendertools,
converter,
blenderscene);
-
- if (gameobj)
+
+ bool isInActiveLayer = (blenderobject->lay & activeLayerBitInfo) !=0;
+ bool addobj=true;
+
+ if (converter->addInitFromFrame)
+ if (!isInActiveLayer)
+ addobj=false;
+
+ if (gameobj&&addobj)
{
MT_Point3 posPrev;
MT_Matrix3x3 angor;
@@ -1920,8 +1927,6 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
Material *mat = give_current_material(blenderobject, 1);
if(mat) BL_ConvertMaterialIpos(mat, gameobj, converter);
- bool isInActiveLayer = (blenderobject->lay & activeLayerBitInfo) !=0;
-
sumolist->Add(gameobj->AddRef());
BL_ConvertProperties(blenderobject,gameobj,timemgr,kxscene,isInActiveLayer);