[Bf-blender-cvs] [f0b9b65] master: Fix compilation error caused by 67f1fd2
Sergey Sharybin
noreply at git.blender.org
Fri Jan 24 09:06:57 CET 2014
Commit: f0b9b65740d08a7ed7a2a34611af9275319073ae
Author: Sergey Sharybin
Date: Fri Jan 24 14:06:23 2014 +0600
https://developer.blender.org/rBf0b9b65740d08a7ed7a2a34611af9275319073ae
Fix compilation error caused by 67f1fd2
Did one tried building blender before commit even?
===================================================================
M source/gameengine/Ketsji/KX_TouchSensor.cpp
===================================================================
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 3ff6587..1b8ef09 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -282,7 +282,7 @@ bool KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll
}
m_bTriggered = true;
m_hitObject = gameobj;
- m_hitMaterial = (client->m_auxilary_info ? (char*)client->m_auxilary_info : "");
+ m_hitMaterial = (client_info->m_auxilary_info ? (char*)client_info->m_auxilary_info : "");
//printf("KX_TouchSensor::HandleCollision\n");
}
More information about the Bf-blender-cvs
mailing list