kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: whitespace

Browse Source
This commit is contained in:
Campbell Barton 2015-08-06 12:34:19 +10:00
parent 89edddb26c
commit 5af7257309
8 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@ -1674,9 +1674,10 @@ CListValue* KX_GameObject::GetChildrenRecursive()
KX_Scene* KX_GameObject::GetScene()
{
SG_Node* node = this->GetSGNode();
if (node == NULL)
if (node == NULL) {
// this happens for object in non active layers, rely on static scene then
return KX_GetActiveScene();
}
return static_cast<KX_Scene*>(node->GetSGClientInfo());
}
@ -4086,7 +4087,7 @@ bool ConvertPythonToGameObject(PyObject *value, KX_GameObject **object, bool py_
}
}
if ( PyObject_TypeCheck(value, &KX_GameObject::Type) ||
if (PyObject_TypeCheck(value, &KX_GameObject::Type) ||
PyObject_TypeCheck(value, &KX_LightObject::Type) ||
PyObject_TypeCheck(value, &KX_Camera::Type) ||
PyObject_TypeCheck(value, &KX_FontObject::Type) ||