archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes from trunk r58324-58419.

Browse Source
This commit is contained in:
Mitchell Stokes
2013-07-19 22:10:11 +00:00
parent eb21bdd249 869d654ccc
commit 103ef7cacb
144 changed files with 1619 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/Expressions/KX_HashedPtr.cpp
View File

@@ -36,6 +36,8 @@ unsigned int KX_Hash(void *inDWord)
{
#if defined(_WIN64) && !defined(FREE_WINDOWS64)
unsigned __int64 key = (unsigned __int64)inDWord;
#elif defined(FREE_WINDOWS64)
unsigned long long key = (unsigned long long)inDWord;
#else
unsigned long key = (unsigned long)inDWord;
#endif

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

@@ -38,6 +38,8 @@
#if defined(_WIN64) && !defined(FREE_WINDOWS64)
typedef unsigned __int64 uint_ptr;
#elif defined(FREE_WINDOWS64)
typedef unsigned long long uint_ptr;
#else
typedef unsigned long uint_ptr;
#endif

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

@@ -33,6 +33,8 @@
#if defined(_WIN64) && !defined(FREE_WINDOWS64)
typedef unsigned __int64 uint_ptr;
#elif defined(FREE_WINDOWS64)
typedef unsigned long long uint_ptr;
#else
typedef unsigned long uint_ptr;
#endif