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:
authorErwin Coumans <blender@erwincoumans.com>2005-11-28 09:51:54 +0300
committerErwin Coumans <blender@erwincoumans.com>2005-11-28 09:51:54 +0300
commite1c66eb14509c9f6f4c59edd8a541e3d49d90cef (patch)
tree3237f6c534b1e7a5a801bb327f55de35425ff5e4 /source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
parent427cae9eebaceeac80f8e7a151661aa36f18db01 (diff)
applied the 64-bit pointer patch submitted by Ken Hughes
Diffstat (limited to 'source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp b/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
index 58c1494724c..b6d385da8ca 100644
--- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
+++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
@@ -37,6 +37,13 @@
#include <config.h>
#endif
+#if defined(_WIN64)
+typedef unsigned __int64 uint_ptr;
+#else
+typedef unsigned long uint_ptr;
+#endif
+
+
bool KX_ObColorIpoSGController::Update(double currentTime)
{
if (m_modified)
@@ -87,10 +94,10 @@ SG_Controller* KX_ObColorIpoSGController::GetReplica(class SG_Node* destnode)
iporeplica->AddInterpolator(copyipo);
MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
- int orgbase = (int)this;
- int orgloc = (int)scaal;
- int offset = orgloc-orgbase;
- int newaddrbase = (int)iporeplica + offset;
+ uint_ptr orgbase = (uint_ptr)this;
+ uint_ptr orgloc = (uint_ptr)scaal;
+ uint_ptr offset = orgloc-orgbase;
+ uint_ptr newaddrbase = (uint_ptr)iporeplica + offset;
MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
copyipo->SetNewTarget((MT_Scalar*)blaptr);
}