diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-07 16:12:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-07 16:12:59 +0400 |
| commit | 11087d4a827996d4d7bd909ccd49c8b4e359572a (patch) | |
| tree | 99094e5e02b10dca6f5de357431785c3e293abed /source/gameengine/BlenderRoutines | |
| parent | 024539b974c9774d77116b3cae9c0dde39c0661c (diff) | |
remove minor differences between these 2 files which are almost exact duplicates (tsk tsk!)
Diffstat (limited to 'source/gameengine/BlenderRoutines')
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index 2776c4ed0db..bcc62a341f8 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -211,7 +211,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat MT_Vector3 dir = (campos - objpos).safe_normalized(); MT_Vector3 up(0,0,1.0); - KX_GameObject* gameobj = (KX_GameObject*)m_clientobject; + KX_GameObject* gameobj = (KX_GameObject *)this->m_clientobject; // get scaling of halo object MT_Vector3 size = gameobj->GetSGNode()->GetWorldScaling(); @@ -241,14 +241,13 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat glTranslated(objpos[0],objpos[1],objpos[2]); glMultMatrixd(maat); - } else { if (objectdrawmode & RAS_IPolyMaterial::SHADOW) { // shadow must be cast to the ground, physics system needed here! MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]); - KX_GameObject *gameobj = (KX_GameObject*)m_clientobject; + KX_GameObject *gameobj = (KX_GameObject *)this->m_clientobject; MT_Vector3 direction = MT_Vector3(0,0,-1); direction.normalize(); @@ -328,7 +327,7 @@ void KX_BlenderRenderTools::RenderText( RAS_IPolyMaterial* polymat, float v1[3], float v2[3], float v3[3], float v4[3], int glattrib) { - const STR_String& mytext = ((CValue*)m_clientobject)->GetPropertyText("Text"); + const STR_String &mytext = ((CValue *)m_clientobject)->GetPropertyText("Text"); const unsigned int flag = polymat->GetFlag(); struct MTFace* tface = 0; |