Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-24 12:06:23 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-24 12:06:23 +0400
commitf0b9b65740d08a7ed7a2a34611af9275319073ae (patch)
tree2496f892baf3deb5ba52d2a30182fa1aae6be568 /source/gameengine/Ketsji/KX_TouchSensor.cpp
parent67f1fd25ee6361df5f84e254eea103fe7952125f (diff)
Fix compilation error caused by 67f1fd2
Did one tried building blender before commit even?
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchSensor.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_TouchSensor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 3ff6587e837..1b8ef09aec8 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");
}