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

2
source/gameengine/Converter/BL_ActionActuator.cpp
View File

@ -90,7 +90,7 @@ BL_ActionActuator::BL_ActionActuator(SCA_IObject *gameobj,
m_stridelength(stride),
m_layer_weight(layer_weight),
m_playtype(playtype),
m_blendmode(blend_mode),
m_blendmode(blend_mode),
m_priority(priority),
m_layer(layer),
m_ipo_flags(ipo_flags),

4
source/gameengine/Converter/BL_ArmatureObject.cpp
View File

@ -233,8 +233,8 @@ BL_ArmatureObject::BL_ArmatureObject(
// During object replication ob->data is increase, we decrease it now because we get a copy.
id_us_min(&((bArmature *)m_origObjArma->data)->id);
m_pose = m_objArma->pose;
// need this to get iTaSC working ok in the BGE
m_pose->flag |= POSE_GAME_ENGINE;
// need this to get iTaSC working ok in the BGE
m_pose->flag |= POSE_GAME_ENGINE;
memcpy(m_obmat, m_objArma->obmat, sizeof(m_obmat));
// The side-effect of this method registers this object as "animatable" with the KX_Scene.

2
source/gameengine/Converter/KX_ConvertControllers.h
View File

@ -41,7 +41,7 @@ void BL_ConvertControllers(
int activeLayerBitInfo,
bool isInActiveLayer,
class KX_BlenderSceneConverter* converter,
bool libloading
bool libloading
);
#endif /* __KX_CONVERTCONTROLLERS_H__ */

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

@ -1674,10 +1674,11 @@ CListValue* KX_GameObject::GetChildrenRecursive()
KX_Scene* KX_GameObject::GetScene()
{
SG_Node* node = this->GetSGNode();
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());
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,11 +4087,11 @@ bool ConvertPythonToGameObject(PyObject *value, KX_GameObject **object, bool py_
}
}
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) ||
PyObject_TypeCheck(value, &KX_NavMeshObject::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) ||
PyObject_TypeCheck(value, &KX_NavMeshObject::Type))
{
*object = static_cast<KX_GameObject*>BGE_PROXY_REF(value);

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

@ -257,7 +257,7 @@ public:
void ConvertAndAddScene(const STR_String& scenename,bool overlay);
void RemoveScene(const STR_String& scenename);
bool ReplaceScene(const STR_String& oldscene,const STR_String& newscene);
bool ReplaceScene(const STR_String& oldscene,const STR_String& newscene);
void SuspendScene(const STR_String& scenename);
void ResumeScene(const STR_String& scenename);

2
source/gameengine/Ketsji/KX_SteeringActuator.cpp
View File

@ -561,7 +561,7 @@ PyAttributeDef KX_SteeringActuator::Attributes[] = {
KX_PYATTRIBUTE_RO_FUNCTION("steeringVec", KX_SteeringActuator, pyattr_get_steeringVec),
KX_PYATTRIBUTE_SHORT_RW("facingMode", 0, 6, true, KX_SteeringActuator, m_facingMode),
KX_PYATTRIBUTE_INT_RW("pathUpdatePeriod", -1, 100000, true, KX_SteeringActuator, m_pathUpdatePeriod),
KX_PYATTRIBUTE_BOOL_RW("lockZVelocity", KX_SteeringActuator, m_lockzvel),
KX_PYATTRIBUTE_BOOL_RW("lockZVelocity", KX_SteeringActuator, m_lockzvel),
{ NULL } //Sentinel
};

6
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -99,9 +99,9 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas, int storage)
m_motionblur(0),
m_motionblurvalue(-1.0),
m_usingoverrideshader(false),
m_clientobject(NULL),
m_auxilaryClientInfo(NULL),
m_drawingmode(KX_TEXTURED),
m_clientobject(NULL),
m_auxilaryClientInfo(NULL),
m_drawingmode(KX_TEXTURED),
m_texco_num(0),
m_attrib_num(0),
//m_last_alphablend(GPU_BLEND_SOLID),

4
source/gameengine/VideoTexture/VideoFFmpeg.h
View File

@ -85,8 +85,8 @@ public:
/// release video source
virtual bool release (void);
/// overwrite base refresh to handle fixed image
virtual void refresh(void);
/// overwrite base refresh to handle fixed image
virtual void refresh(void);
/// play video
virtual bool play (void);
/// pause video