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:
authorMitchell Stokes <mogurijin@gmail.com>2014-05-28 04:05:35 +0400
committerMitchell Stokes <mogurijin@gmail.com>2014-05-28 04:05:35 +0400
commit7317b4fcf10edb367b48c32bd8d44ee1902148fe (patch)
tree939d3649a2693928e8ea4dca534af138037c53af /source/gameengine
parent04623e8b1fa804bdd9dd3a75a5238342ddf913b2 (diff)
Fix 40343: Using replace mesh (e.g., LODs) on a skinned mesh crashes.
Need to use parent->AddRef() in a few places.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 4d2a842a7e5..d06b9a04eb1 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1185,7 +1185,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u
oldblendobj, blendobj,
mesh,
true,
- static_cast<BL_ArmatureObject*>( parentobj )
+ static_cast<BL_ArmatureObject*>( parentobj->AddRef() )
);
modifierDeformer->LoadShapeDrivers(parentobj);
}
@@ -1212,7 +1212,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u
mesh,
true,
true,
- static_cast<BL_ArmatureObject*>( parentobj )
+ static_cast<BL_ArmatureObject*>( parentobj->AddRef() )
);
shapeDeformer->LoadShapeDrivers(parentobj);
}
@@ -1237,7 +1237,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u
mesh,
true,
true,
- static_cast<BL_ArmatureObject*>( parentobj )
+ static_cast<BL_ArmatureObject*>( parentobj->AddRef() )
);
newobj->SetDeformer(skinDeformer);
}