blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Fix T40146: BGE Compound parent crash

This commit is contained in:
Mitchell Stokes 2014-07-15 17:52:01 -07:00
parent 490da48d78
commit dfe1b9b7a7
Notes: blender-bot 2023-02-14 10:40:07 +01:00 
Referenced by issue #41085, Blender crashes when using "spline" or "segments" for bevel curve factor.
Referenced by issue #41046, BGE Compound bug
Referenced by issue #40146, Gui Bleeding
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/gameengine/Ketsji/KX_KetsjiEngine.h
View File

@ -223,6 +223,7 @@ public:
PyObject* GetPyProfileDict();
#endif
void SetSceneConverter(KX_ISceneConverter* sceneconverter);
KX_ISceneConverter* GetSceneConverter() { return m_sceneconverter; }
void SetAnimRecordMode(bool animation_record, int startFrame);
RAS_IRasterizer* GetRasterizer() { return m_rasterizer; }

1
source/gameengine/Physics/Bullet/CMakeLists.txt
View File

@ -29,6 +29,7 @@ remove_strict_flags()
set(INC
.
../common
../../Converter
../../Expressions
../../GameLogic
../../Ketsji

13
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -42,6 +42,7 @@ subject to the following restrictions:
#include "PHY_Pro.h"
#include "KX_GameObject.h"
#include "KX_PythonInit.h" // for KX_RasterizerDrawDebugLine
#include "KX_BlenderSceneConverter.h"
#include "RAS_MeshObject.h"
#include "RAS_Polygon.h"
#include "RAS_TexVert.h"
@ -3044,9 +3045,17 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject
CcdConstructionInfo ci;
class CcdShapeConstructionInfo *shapeInfo = new CcdShapeConstructionInfo();
KX_GameObject *parent = gameobj->GetParent();
if (parent)
// get Root Parent of blenderobject
Object *blenderparent = blenderobject->parent;
while (blenderparent && blenderparent->parent) {
blenderparent = blenderparent->parent;
}
KX_GameObject *parent = NULL;
if (blenderparent)
{
KX_BlenderSceneConverter *converter = (KX_BlenderSceneConverter*)KX_GetActiveEngine()->GetSceneConverter();
parent = converter->FindGameObject(blenderparent);
isbulletdyna = false;
isbulletsoftbody = false;
shapeprops->m_mass = 0.f;

1
source/gameengine/Physics/Bullet/SConscript
View File

@ -39,6 +39,7 @@ incs = [
'#source/blender/blenkernel',
'#source/blender/blenlib',
'#source/blender/makesdna',
'#source/gameengine/Converter',
'#source/gameengine/Expressions',
'#source/gameengine/GameLogic',
'#source/gameengine/Ketsji',