Syncing Orange branch with bf-blender
authorTon Roosendaal <ton@blender.org>
Wed, 30 Nov 2005 13:58:01 +0000 (13:58 +0000)
committerTon Roosendaal <ton@blender.org>
Wed, 30 Nov 2005 13:58:01 +0000 (13:58 +0000)
36 files changed:
intern/bmfont/intern/BMF_BitmapFont.cpp
intern/elbeem/make/msvc_7_0/elbeem.vcproj
intern/ghost/intern/GHOST_SystemCarbon.cpp
projectfiles/blender/imbuf/BL_imbuf.dsp
projectfiles_vc7/blender/blender.vcproj
projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
release/scripts/bevel_center.py
release/scripts/lightwave_import.py
release/scripts/uv_export.py
source/blender/render/intern/source/rendercore.c
source/blender/src/editscreen.c
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_SkinDeformer.cpp
source/gameengine/Converter/BL_SkinDeformer.h
source/gameengine/Expressions/KX_HashedPtr.cpp
source/gameengine/Expressions/KX_HashedPtr.h
source/gameengine/Ketsji/KX_CameraIpoSGController.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_IPO_SGController.cpp
source/gameengine/Ketsji/KX_LightIpoSGController.cpp
source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
source/gameengine/Ketsji/KX_WorldIpoController.cpp
source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
source/kernel/gen_system/GEN_HashedPtr.cpp
source/kernel/gen_system/GEN_HashedPtr.h
source/nan_definitions.mk
tools/scons/bs/bs_dirs.py

index 7997a94344b93d0f0df68f2bdd9bde38fda6c811..bbba2c978dd71597ab4d6568bb089b87e17af3c5 100644 (file)
 #include "BMF_BitmapFont.h"
 
 
-#ifdef __APPLE__        
-#include <stdio.h>
-
-static int needs_nvidia_rasterpos_workaround(void)
-{
-       static int well_is_it= -1;
-       
-       if (well_is_it==-1)
-       {
-               well_is_it= (strncmp((char *)glGetString(GL_RENDERER), "NVIDIA GeForce 6800", 18) == 0);
-               if ( well_is_it != 0)
-               {
-                       const GLubyte* vers = glGetString(GL_VERSION);
-                       const GLubyte* v = vers;
-                       int major = 0, minor = 0, sub = 0;
-                       
-                       //advance to the '-'
-                       while ((*v != 0) && (*v!='-'))
-                               v++;
-                       
-                       if (*v == '-')
-                       {
-                               int i = 0;
-                               v++;
-                               
-                               while ((v[i] <= '9') && (v[i] >= '0'))
-                               {
-                                       major *=10;
-                                       major += v[i]-'0';
-                                       i++;
-                               }
-                               
-                               if (v[i] == '.')
-                               {
-                                       i++;
-                                       while ((v[i] <= '9') && (v[i] >= '0'))
-                                       {
-                                               minor *=10;
-                                               minor += v[i]-'0';
-                                               i++;
-                                       }
-                               }
-                               else
-                                       major = -1;
-                               
-                               if (v[i] == '.')
-                               {
-                                       i++;
-                                       while ((v[i] <= '9') && (v[i] >= '0'))
-                                       {
-                                               sub *=10;
-                                               sub += v[i]-'0';
-                                               i++;
-                                       }
-                               }
-                               else
-                                       minor = -1;
-                       }
-
-                       //OS X 10.4.3 is the first version that contained the fix for this problem
-                       // and the 6800's driver version in it is 1.4.16.  So anything after that
-                       // doesn't need the workaround
-
-                       if ( (major == -1) || (minor == -1))
-                       //If anything went wrong don't do the workaround
-                       //
-                               well_is_it = 0;
-                       else if ( (major <= 1) && (minor <= 4) && (sub < 16))
-                               well_is_it = 1;
-                       else
-                               well_is_it = 0;
-               }       
-       }
-
-       return well_is_it;
-}
-
-
-#endif
-
 BMF_BitmapFont::BMF_BitmapFont(BMF_FontData* fontData)
 : m_fontData(fontData)
 {
@@ -154,19 +74,7 @@ void BMF_BitmapFont::DrawString(char* str)
        GLint alignment;
        unsigned char c;
 
-#ifdef __APPLE__        
-     GLint vp[4];  // hack stuff        
-     GLubyte nullm = 0;      // hack stuff      
-        
-     if(needs_nvidia_rasterpos_workaround()) {  // was is_a_really_crappy_nvidia_card()
-             glGetIntegerv(GL_VIEWPORT, vp);   // hack stuff    
-        
-             glBitmap(1, 1, 0, 0, -vp[0], vp[1], &nullm);       
-        
-         }      
- #endif
-       glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
+       glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
        
        while ( (c = (unsigned char) *str++) ) {
index f2c4451233848a38188d54d08d5cc5af238620ac..afd4c345ccd4680787c443526642d34352988845 100644 (file)
@@ -273,9 +273,6 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\ntl_scene.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\intern\ntl_world.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\intern\parametrizer.cpp">
                        </File>
@@ -285,18 +282,6 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\simulation_object.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\intern\solver_init.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\solver_interface.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\solver_main.cpp">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\solver_util.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\intern\utilities.cpp">
                        </File>
@@ -311,9 +296,6 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\cfgparser.h">
                        </File>
-                       <File
-                               RelativePath="..\..\intern\elbeem.h">
-                       </File>
                        <File
                                RelativePath="..\..\intern\globals.h">
                        </File>
@@ -368,9 +350,6 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\ntl_vector3dim.h">
                        </File>
-                       <File
-                               RelativePath="..\..\intern\ntl_world.h">
-                       </File>
                        <File
                                RelativePath="..\..\intern\parametrizer.h">
                        </File>
@@ -380,18 +359,6 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\simulation_object.h">
                        </File>
-                       <File
-                               RelativePath="..\..\intern\solver_class.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\solver_dimenions.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\solver_interface.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\intern\solver_relax.h">
-                       </File>
                        <File
                                RelativePath="..\..\intern\utilities.h">
                        </File>
index ee76349ededded616172d377408535fed415fcf0..d1caadab219edcf7f5d180fbe1c71d9f930f8b0d 100644 (file)
@@ -655,7 +655,6 @@ OSStatus GHOST_SystemCarbon::handleWindowEvent(EventRef event)
                        case kEventWindowActivated:
                                m_windowManager->setActiveWindow(window);
                                window->loadCursor(window->getCursorVisibility(), window->getCursorShape());
-                               window->updateDrawingContext();
                                pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowActivate, window) );
                                break;
                        case kEventWindowDeactivated:
@@ -664,7 +663,6 @@ OSStatus GHOST_SystemCarbon::handleWindowEvent(EventRef event)
                                break;
                        case kEventWindowUpdate:
                                //if (getFullScreen()) GHOST_PRINT("GHOST_SystemCarbon::handleWindowEvent(): full-screen update event\n");
-                               window->updateDrawingContext();
                                pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowUpdate, window) );
                                break;
                        case kEventWindowBoundsChanged:
index b6134b5d805db97204934854e205b9ce46003f15..ef99a25239c64eb39f645d60edc8b9ac9b6fd33c 100644 (file)
@@ -70,7 +70,7 @@ LIB32=link.exe -lib
 MTL=midl.exe
 LINK32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\blender\imbuf\intern" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\source\blender\makesdna" /I "..\..\..\..\lib\windows\tiff\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /FD /I /GZ "..\..\..\source\blender\imbuf" /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\source\blender\imbuf\intern" /I "..\..\..\source\blender\quicktime" /I "..\..\..\source\blender\blenloader" /I "..\..\..\source\blender\render\extern\include" /I "..\..\..\..\lib\windows\guardedalloc\include" /I "..\..\..\source\blender\avi" /I "..\..\..\source\blender\imbuf" /I "..\..\..\source\blender\blenkernel" /I "..\..\..\source\blender\blenlib" /I "..\..\..\source\blender\include" /I "..\..\..\..\lib\windows\jpeg\include" /I "..\..\..\..\lib\windows\zlib\include" /I "..\..\..\..\lib\windows\png\include" /I "..\..\..\source\blender\makesdna..\..\..\lib\windows\\" /I "..\..\..\..\lib\windows\tiff\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "WITH_QUICKTIME" /YX /FD /I /GZ "..\..\..\source\blender\imbuf" /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
index e8a8580bb590551d6e77f5f12602ff786a4f220e..7da591109f5c53604035edb1ab2308a3012c3759 100644 (file)
@@ -63,7 +63,6 @@ ECHO Copying required 3rd party dlls...
 XCOPY /Y ..\..\..\lib\windows\python\lib\python24.dll ..\..\bin
 XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin
 XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin
-XCOPY /Y ..\..\..\lib\windows\tiff\lib\libtiff.dll ..\..\bin
 ECHO Copying language folder
 ECHO Done
 "/>
@@ -141,7 +140,6 @@ XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin\debug
 XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin\debug
 XCOPY /Y ..\..\..\lib\windows\python\lib\python24_d.dll ..\..\bin\debug
 XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\bin\debug
-XCOPY /Y ..\..\..\lib\windows\tiff\lib\libtiff.dll ..\..\bin\debug
 ECHO Copying language folder
 IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender
 XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E
index 2ce865373dc3ba25f1adfbb80d4a150ce02523bc..c608b3044eae7fbefe09265b0e0a57d6fd5b1d68 100644 (file)
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\tiff\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
                                PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
@@ -73,7 +73,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\tiff\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
                                PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\tiff\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
                                PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\tiff\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
                                PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\tiff\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
                                PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\tiff\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include"
                                PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\divers.c">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\imbuf\intern\dynlibtiff.c">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\filter.c">
                        </File>
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\targa.c">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\imbuf\intern\tiff.c">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\util.c">
                        </File>
                <Filter
                        Name="Header Files"
                        Filter="h;hpp;hxx;hm;inl">
-                       <File
-                               RelativePath="..\..\..\source\blender\imbuf\intern\dynlibtiff.h">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\IMB_allocimbuf.h">
                        </File>
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\IMB_targa.h">
                        </File>
-                       <File
-                               RelativePath="..\..\..\source\blender\imbuf\intern\IMB_tiff.h">
-                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\imbuf\intern\imbuf.h">
                        </File>
index 3a0169f2dfb3050af484dedf794a55cbc3e5292c..6025cef7f0e11f1e41da9a25e143542dbb005928 100644 (file)
@@ -123,7 +123,7 @@ def parall_coord(old, dir):
        return (nco,vec)
 
 def get_vert(old, dir):
-       """ Look in NV if a vertex corresponding to the vertex old and the
+       """ Look in NV if a vertice corresponding to the vertex old and the
        direction dir already exists, and create one otherwise""" 
        (nco, vec) = parall_coord(old, dir)
        v = is_in_NV(old,vec)
@@ -315,7 +315,7 @@ def make_corners():
                        is_in_v = lambda x:x in V
                        eed =  [filter(is_in_v, l) for l in q]
                        #
-                       # We will add the edges coming from faces where only one vertex is selected.
+                       # We will add the edges coming from faces where only one vertice is selected.
                        # They are stocked in NC.
                        if v in NC.keys():
                                eed = eed+NC[v]
index 8dadbf3c01c7822364e2bf1d269dd482202cacc0..8680890b0ced49a5bd3175b24b8b745d9ee7424c 100644 (file)
@@ -245,8 +245,8 @@ def read_lwo2(file, filename, typ="LWO2"):
     # init value is: object_list = [[None, {}, [], [], {}, {}, 0, {}, {}]]
     #0 - objname                    #original name
     #1 - obj_dict = {TAG}           #objects created
-    #2 - verts = []                 #object vertices
-    #3 - faces = []                 #object faces (associations poly -> vertices)
+    #2 - verts = []                 #object vertexes
+    #3 - faces = []                 #object faces (associations poly -> vertexes)
     #4 - obj_dim_dict = {TAG}       #tuples size and pos in local object coords - used for NON-UV mappings
     #5 - polytag_dict = {TAG}       #tag to polygon mapping
     #6 - patch_flag                 #0 = surf; 1 = patch (subdivision surface) - it was the image list
@@ -286,7 +286,7 @@ def read_lwo2(file, filename, typ="LWO2"):
                 if object_list[object_index][3] != []:
                     object_list.append([object_list[object_index][0],                  #update name
                                         {},                                            #init
-                                        copy.deepcopy(object_list[object_index][2]),   #same vertices
+                                        copy.deepcopy(object_list[object_index][2]),   #same vertexes
                                         [],                                            #no faces
                                         {},                                            #no need to copy - filled at runtime
                                         {},                                            #polygon tagging will follow
@@ -363,7 +363,7 @@ def read_verts(lwochunk):
             Blender.Window.DrawProgressBar(float(i)/numverts, "Reading Verts")
         x, y, z = struct.unpack(">fff", data.read(12))
         verts[i] = (x, z, y)
-    tobj.pprint("read %d vertices" % (i+1))
+    tobj.pprint("read %d vertexes" % (i+1))
     return verts
 # enddef read_verts
 
@@ -444,7 +444,7 @@ def read_vx(data):
 # ======================
 def read_vmap(uvcoords_dict, facesuv_dict, faces, maxvertnum, lwochunk):
     if maxvertnum == 0:
-        tobj.pprint ("Found VMAP but no vertices to map!")
+        tobj.pprint ("Found VMAP but no vertexes to map!")
         return uvcoords_dict, facesuv_dict
     data = cStringIO.StringIO(lwochunk.read())
     map_type = data.read(4)
@@ -460,7 +460,7 @@ def read_vmap(uvcoords_dict, facesuv_dict, faces, maxvertnum, lwochunk):
         vertnum, vnum_size = read_vx(data)
         u, v = struct.unpack(">ff", data.read(8))
         if vertnum >= maxvertnum:
-            tobj.pprint ("Hem: more uvmap than vertices? ignoring uv data for vertex %d" % vertnum)
+            tobj.pprint ("Hem: more uvmap than vertexes? ignoring uv data for vertex %d" % vertnum)
         else:
             my_uv_list[vertnum] = (u, v)
         i += 8 + vnum_size
@@ -483,7 +483,7 @@ def read_vmap(uvcoords_dict, facesuv_dict, faces, maxvertnum, lwochunk):
 def read_vmad(uvcoords_dict, facesuv_dict, faces, maxvertnum, lwochunk):
     maxfacenum = len(faces)
     if maxvertnum == 0 or maxfacenum == 0:
-        tobj.pprint ("Found VMAD but no vertices to map!")
+        tobj.pprint ("Found VMAD but no vertexes to map!")
         return uvcoords_dict, facesuv_dict
     data = cStringIO.StringIO(lwochunk.read())
     map_type = data.read(4)
@@ -508,19 +508,19 @@ def read_vmad(uvcoords_dict, facesuv_dict, faces, maxvertnum, lwochunk):
         i += vnum_size
         u, v = struct.unpack(">ff", data.read(8))
         if polynum >= maxfacenum or vertnum >= maxvertnum:
-            tobj.pprint ("Hem: more uvmap than vertices? ignorig uv data for vertex %d" % vertnum)
+            tobj.pprint ("Hem: more uvmap than vertexes? ignorig uv data for vertex %d" % vertnum)
         else:
             my_uv_list.append( (u,v) )
             newindex = len(my_uv_list) - 1
             for vi in range(len(my_facesuv_list[polynum])): #polynum starting from 1 or from 0?
                 if my_facesuv_list[polynum][vi] == vertnum:
                     my_facesuv_list[polynum][vi] = newindex
-            #end loop on current face vertices
+            #end loop on current face vertexes
         i += 8
     #end loop on uv pairs
     uvcoords_dict[name] = my_uv_list
     facesuv_dict[name] = my_facesuv_list
-    tobj.pprint ("updated %d vertices data" % (newindex-lastindex))
+    tobj.pprint ("updated %d vertexes data" % (newindex-lastindex))
     return uvcoords_dict, facesuv_dict
 
 
@@ -916,7 +916,7 @@ def dist_vector (head, tail): #vector from head to tail
 # ================
 def find_ear(normal, list_dict, verts, face):
     nv = len(list_dict['MF'])
-    #looping through vertices trying to find an ear
+    #looping through vertexes trying to find an ear
     #most likely in case of panic
     mlc = 0
     mla = 1
@@ -974,10 +974,10 @@ def find_ear(normal, list_dict, verts, face):
                         concave_inside = 1
                         break
                 #endif found a concave vertex
-            #end loop looking for concave vertices
+            #end loop looking for concave vertexes
             if (concave == 0) or (concave_inside == 0):
-                #no concave vertices in polygon (should not be): return immediately
-                #looped all concave vertices and no one inside found
+                #no concave vertexes in polygon (should not be): return immediately
+                #looped all concave vertexes and no one inside found
                 return [c, a, b]
         #no convex vertex, try another one
     #end loop to find a suitable base vertex for ear
@@ -1003,12 +1003,12 @@ def reduce_face(verts, face):
     list_dict['P'] = [None] * nv
     #list of distances
     for mvi in list_dict['MF']:
-        #vector between two vertices
+        #vector between two vertexes
         mvi_hiend = (mvi+1) % nv      #last-to-first
         vi_hiend = face[mvi_hiend] #vertex
         vi = face[mvi]
         list_dict['D'][mvi] = dist_vector(verts[vi_hiend], verts[vi])
-    #list of cross products - normals evaluated into vertices
+    #list of cross products - normals evaluated into vertexes
     for vi in range(nv):
         list_dict['X'][vi] = Blender.Mathutils.CrossVecs(list_dict['D'][vi], list_dict['D'][vi-1])
     my_face_normal = Blender.Mathutils.Vector([list_dict['X'][0][0], list_dict['X'][0][1], list_dict['X'][0][2]])
@@ -1050,8 +1050,8 @@ def reduce_face(verts, face):
             list_dict['P'].pop(ct[1])
             one_concave = reduce(lambda x, y: (x) or (y<0.0), list_dict['P'], 0)
             nv -=1
-        else: #here if no more concave vertices
-            if nv == 4: break  #quads only if no concave vertices
+        else: #here if no more concave vertexes
+            if nv == 4: break  #quads only if no concave vertexes
             decomposition_list.append([list_dict['MF'][0], list_dict['MF'][1], list_dict['MF'][2]])
             #physical removal
             list_dict['MF'].pop(1)
@@ -1152,7 +1152,7 @@ def my_create_mesh(complete_vertlist, complete_facelist, current_facelist, objna
 
     mesh = Blender.NMesh.GetRaw()
 
-    #append vertices
+    #append vertexes
     jj = 0
     for i in range(len(complete_vertlist)):
         if vertex_map[i] == 1:
@@ -1161,7 +1161,7 @@ def my_create_mesh(complete_vertlist, complete_facelist, current_facelist, objna
             mesh.verts.append(Blender.NMesh.Vert(x, y, z))
             vertex_map[i] = jj
             jj += 1
-    #end sweep over vertices
+    #end sweep over vertexes
 
     #append faces
     for i in range(len(cur_ptag_faces)):
@@ -1172,7 +1172,7 @@ def my_create_mesh(complete_vertlist, complete_facelist, current_facelist, objna
         #for vi in cur_ptag_faces[i]:
             index = vertex_map[vi]
             face.v.append(mesh.verts[index])
-        #end sweep over vertices
+        #end sweep over vertexes
         mesh.faces.append(face)
     #end sweep over faces
 
index bf02c323f61d90ca97352bffd6f4b83746adb0a0..78d173d88fb0363c445df8b0762d0fee7193460e 100644 (file)
@@ -9,7 +9,7 @@ Tooltip: 'Export the UV face layout of the selected object to a .TGA file'
 
 __author__ = "Martin 'theeth' Poirier"
 __url__ = ("http://www.blender.org", "http://www.elysiun.com")
-__version__ = "1.4"
+__version__ = "1.3a"
 
 __bpydoc__ = """\
 This script exports the UV face layout of the selected mesh object to
@@ -26,9 +26,8 @@ There are more options to configure, like setting export path, if image should
 use object's name and more.
 
 Notes:<br>
-        Jean-Michel Soler (jms) wrote TGA functions used by this script.<br>
-        Zaz added the default path code and Selected Face option.<br>
-        Macouno fixed a rounding error in the step calculations<br>
+    Jean-Michel Soler (jms) wrote TGA functions used by this script.
+    Zaz added the default path code and Selected Face option.
 """
 
 
@@ -63,22 +62,19 @@ Notes:<br>
 # Communicate problems and errors on:
 # http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender 
 # --------------------------
-#       Version 1.1            
+#    Version 1.1      
 # Clear a bug that crashed the script when UV coords overlapped in the same faces
 # --------------------------
-#       Version 1.2
+#    Version 1.2
 # Now with option to use the object's name as filename
 # --------------------------
-#       Version 1.3 Updates by Zaz from Elysiun.com
+#    Version 1.3 Updates by Zaz from Elysiun.com
 # Default path is now the directory of the last saved .blend
 # New options: Work on selected face only & Scale image when face wraps
 # --------------------------
-#       Version 1.3a
+#    Version 1.3a
 # Corrected a minor typo and added the tga extension to both export call
 # --------------------------
-#       Version 1.4 Updates by Macouno from Elysiun.com
-# Fixed rounding error that can cause breaks in lines.
-# --------------------------
 
 import Blender
 from math import *
@@ -138,42 +134,42 @@ def bevent(evt):
                        UV_Export(bSize.val, bWSize.val, bFile.val + ".tga")
 
 def Buffer(height=16, width=16, profondeur=3,rvb=255 ):  
-       """  
-       reserve l'espace memoire necessaire  
-       """  
-       p=[rvb]  
-       b=p*height*width*profondeur  
-       return b  
+   """  
+   reserve l'espace memoire necessaire  
+   """  
+   p=[rvb]  
+   b=p*height*width*profondeur  
+   return b  
 
 def write_tgafile(loc2,bitmap,width,height,profondeur):  
-       f=open(loc2,'wb')  
+   f=open(loc2,'wb')  
 
-       Origine_en_haut_a_gauche=32  
-       Origine_en_bas_a_gauche=0  
+   Origine_en_haut_a_gauche=32  
+   Origine_en_bas_a_gauche=0  
 
-       Data_Type_2=2  
-       RVB=profondeur*8  
-       RVBA=32  
-       entete0=[]  
-       for t in range(18):  
-         entete0.append(chr(0))  
+   Data_Type_2=2  
+   RVB=profondeur*8  
+   RVBA=32  
+   entete0=[]  
+   for t in range(18):  
+     entete0.append(chr(0))  
 
-       entete0[2]=chr(Data_Type_2)  
-       entete0[13]=chr(width/256)  
-       entete0[12]=chr(width % 256)  
-       entete0[15]=chr(height/256)  
-       entete0[14]=chr(height % 256)  
-       entete0[16]=chr(RVB)  
-       entete0[17]=chr(Origine_en_bas_a_gauche)  
+   entete0[2]=chr(Data_Type_2)  
+   entete0[13]=chr(width/256)  
+   entete0[12]=chr(width % 256)  
+   entete0[15]=chr(height/256)  
+   entete0[14]=chr(height % 256)  
+   entete0[16]=chr(RVB)  
+   entete0[17]=chr(Origine_en_bas_a_gauche)  
 
-       #Origine_en_haut_a_gauche  
+   #Origine_en_haut_a_gauche  
 
-       for t in entete0:  
-         f.write(t)  
+   for t in entete0:  
+     f.write(t)  
 
-       for t in bitmap:  
-         f.write(chr(t))  
-       f.close()  
+   for t in bitmap:  
+     f.write(chr(t))  
+   f.close()  
 
 def UV_Export(size, wsize, file):
        obj = Blender.Object.GetSelected()
@@ -242,12 +238,11 @@ def UV_Export(size, wsize, file):
                                co2 = f[index + 1]
                        else:
                                co2 = f[0]
-
-                       step = int(ceil(size*sqrt((co1[0]-co2[0])**2+(co1[1]-co2[1])**2)))
+                       step = int(size*sqrt((co1[0]-co2[0])**2+(co1[1]-co2[1])**2))
                        if step:
-                               for t in range(step):
-                                       x = int(floor((co1[0] + t*(co2[0]-co1[0])/step) * size))
-                                       y = int(floor((co1[1] + t*(co2[1]-co1[1])/step) * size))
+                               for t in range(step + 1):
+                                       x = int((co1[0] + t*(co2[0]-co1[0])/step) * size)
+                                       y = int((co1[1] + t*(co2[1]-co1[1])/step) * size)
 
                                        if bWrap.val:
                                                x = x % wrapSize
@@ -256,17 +251,16 @@ def UV_Export(size, wsize, file):
                                                x = int ((x - minx) * scale)
                                                y = int ((y - miny) * scale)
                                                
-                                       co = x * 3 + y * 3 * size;
-                                       
+                                       co = x * 3 + y * 3 * size
                                        img[co] = 0
                                        img[co+1] = 0
-                                       img[co+2] = 0
+                                       img[co+2] = 255
                                        if wsize > 1:
                                                for x in range(-1*wsize + 1,wsize):
                                                        for y in range(-1*wsize,wsize):
                                                                img[co + 3 * x + y * 3 * size] = 0
                                                                img[co + 3 * x + y * 3 * size +1] = 0
-                                                               img[co + 3 * x + y * 3 * size +2] = 0
+                                                               img[co + 3 * x + y * 3 * size +2] = 255
        
                for v in f:
                        x = int(v[0] * size)
@@ -282,7 +276,8 @@ def UV_Export(size, wsize, file):
                        co = x * 3 + y * 3 * size
                        img[co] = 0
                        img[co+1] = 0
-                       img[co+2] = 255                                 
+                       img[co+2] = 0
+                               
        
        
        write_tgafile(file,img,size,size,3)
index 73d57e453b83eeb932857f0754babc2c520570ca..98c82019fa4f1f1f4958b783b0c9a0928cacdd2a 100644 (file)
@@ -2006,7 +2006,20 @@ void shade_input_set_coords(ShadeInput *shi, float u, float v, int i1, int i2, i
                                        shi->dyuv[0]= 2.0*(dl*uv3[0]-duv[0]*uv1[0]-duv[1]*uv2[0]);
                                        shi->dyuv[1]= 2.0*(dl*uv3[1]-duv[0]*uv1[1]-duv[1]*uv2[1]);
                                }
-                               
+#if 0
+                               {       /* tangent derived from UV, comes back later! (ton) */
+                                       //float s1= uv2[0] - uv1[0];
+                                       //float s2= uv3[0] - uv1[0];
+                                       float t1= uv2[1] - uv1[1];
+                                       float t2= uv3[1] - uv1[1];
+                                       
+                                       shi->vn[0]= (t2 * (v2->co[0]-v1->co[0]) - t1 * (v3->co[0]-v1->co[0])); 
+                                       shi->vn[1]= (t2 * (v2->co[1]-v1->co[1]) - t1 * (v3->co[1]-v1->co[1]));
+                                       shi->vn[2]= (t2 * (v2->co[2]-v1->co[2]) - t1 * (v3->co[2]-v1->co[2]));
+                                       Normalise(shi->vn);
+                                       vlr->flag |= R_TANGENT;
+                               }                                       
+#endif
                                if(mode & MA_FACETEXTURE) {
                                        if((mode & (MA_VERTEXCOL|MA_VERTEXCOLP))==0) {
                                                shi->vcol[0]= 1.0;
index b665c64e0e3e245df3024696a24a937196154c74..b95fc9f11bda1316f1d6a12059229b18b3a13f72 100644 (file)
         always reset to zero.
  */
 
+/* comment added to test orange branch */
+
 static void testareas(void);
 static void area_autoplayscreen(void);
 static void wait_for_event(void);
index 113556f0b11cbe642432a1fe97da92cb5eebc518..7f870e368bdbe117dddd4fa087dd897226030ce4 100644 (file)
 BL_ActionActuator::~BL_ActionActuator()
 {
        if (m_pose) {
-               free_pose_channels(m_pose);
+//             clear_pose(m_pose);
                MEM_freeN(m_pose);
                m_pose = NULL;
        };
        
        if (m_userpose){
-               free_pose_channels(m_userpose);
+//             clear_pose(m_userpose);
                MEM_freeN(m_userpose);
                m_userpose=NULL;
        }
        if (m_blendpose) {
-               free_pose_channels(m_blendpose);
+//             clear_pose(m_blendpose);
                MEM_freeN(m_blendpose);
                m_blendpose = NULL;
        };
index f0c58f1d9894ec0ac3a09f25a3936494cf8026f4..0c0034bb4af0692b1911f92a12286402937cf8df 100644 (file)
@@ -68,16 +68,15 @@ void BL_ArmatureObject::ProcessReplica(BL_ArmatureObject *replica)
 BL_ArmatureObject::~BL_ArmatureObject()
 {
        if (m_mrdPose){
-               free_pose_channels(m_mrdPose);
+//             clear_pose(m_mrdPose);
                MEM_freeN(m_mrdPose);
        }
 }
 
-/* note, you can only call this for exisiting Armature objects, and not mix it with other Armatures */
-/* there is only 1 unique Pose per Armature */
 void BL_ArmatureObject::ApplyPose()
 {
        if (m_pose){
+//             apply_pose_armature(GetArmature(), m_pose, 1);
                if (!m_mrdPose)
                        copy_pose (&m_mrdPose, m_pose, 0);
                else
@@ -161,16 +160,18 @@ bool BL_ArmatureObject::GetBoneMatrix(Bone* bone, MT_Matrix4x4& matrix) const
 {
        // ton hack
        bPoseChannel *pchan= get_pose_channel(m_pose, bone->name);
-
-       if(pchan) {
-               matrix.setValue(&pchan->pose_mat[0][0]);
-               return true;
-       }
-       return false;
+       
+//     MT_assert(verify_boneptr((bArmature*) GetArmature(), bone) && "Bone is not part of this armature.");
+       
+       matrix.setValue(&pchan->pose_mat[0][0]);
+       
+       return true;
 }
 
 float BL_ArmatureObject::GetBoneLength(Bone* bone) const
 {
+//     MT_assert(verify_boneptr((bArmature*) GetArmature(), bone) && "Bone is not part of this armature.");
+       
        return (MT_Point3(bone->head) - MT_Point3(bone->tail)).length();
 }
 
index ee298d70bafe4bc45fa171520d2f559278182357..9bd6e54c6d84f63bca245fb50d3feb2511dee2b5 100644 (file)
@@ -59,8 +59,6 @@ BL_SkinDeformer::~BL_SkinDeformer()
 {
 };
 
-/* XXX note, this __NLA_OLDDEFORM define seems to be obsolete */
-
 bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *mat)
 {
        size_t                  i, j, index;
@@ -115,8 +113,7 @@ bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *mat)
                        co[2]=mvert->co[2];
 
                        //      Do the deformation
-/* XXX note, doesnt exist anymore */
-//                     GB_calc_armature_deform(co, dvert);
+                       GB_calc_armature_deform(co, dvert);
                        tv->SetXYZ(co);
 #else
                        //      Set the data
@@ -152,30 +149,27 @@ void BL_SkinDeformer::Update(void)
        if (m_lastUpdate!=m_armobj->GetLastFrame()){    
                
                /* Do all of the posing necessary */
+               GB_init_armature_deform (m_defbase, m_premat, m_postmat);
                m_armobj->ApplyPose();
+//             precalc_armature_posemats (m_armobj->GetArmature());
+//             for (Bone *curBone=(Bone*)m_armobj->GetArmature()->bonebase.first; curBone; curBone=(Bone*)curBone->next)
+//                     precalc_bone_defmat(curBone);
+// note: where_is_pose() does it all...
                
-               /* XXX note: where_is_pose() (from BKE_armature.h) calculates all matrices needed to start deforming */
-               /* but it requires the blender object pointer... */
-//             void where_is_pose (Object *ob);
-               
-               /* store verts locally */
+               VerifyStorage();
+
+               /* Transform the verts & store locally */
                for (int v =0; v<m_bmesh->totvert; v++){
                        float co[3];
-                       /* XXX note, dunno about this line */
-                       m_transverts[v]=MT_Point3(m_bmesh->mvert[v].co);
+
+                       co[0]=m_bmesh->mvert[v].co[0];
+                       co[1]=m_bmesh->mvert[v].co[1];
+                       co[2]=m_bmesh->mvert[v].co[2];
+                       GB_calc_armature_deform(co, &m_bmesh->dvert[v]);
+
+                       m_transverts[v]=MT_Point3(co);
                }
                
-               /* XXX note: now use this call instead */
-//             void armature_deform_verts(Object *armOb, Object *target, float (*vertexCos)[3], int numVerts, int deformflag) 
-               //              - armOb = armature object
-               //              - target = Mesh
-               //              - vertexCos[3] = array of numVerts float vectors (3 floats)
-               //              - set deformflag to ARM_DEF_VGROUP
-               //              example (after having filled the m_transverts array):
-               //              armature_deform_verts(m_armobj, m_meshobj, m_transverts, m_bmesh->totvert, ARM_DEF_VGROUP);
-               
-               VerifyStorage();
-                       
                RecalcNormals();
                
 
@@ -184,17 +178,15 @@ void BL_SkinDeformer::Update(void)
        }
 }
 
-/* XXX note: I propose to drop this function */
-
 void BL_SkinDeformer::SetArmature(BL_ArmatureObject *armobj)
 {
-//     m_armobj = armobj;
+       m_armobj = armobj;
 
-//     for (bDeformGroup *dg=(bDeformGroup*)m_defbase->first; dg; dg=(bDeformGroup*)dg->next) {
+       for (bDeformGroup *dg=(bDeformGroup*)m_defbase->first; dg; dg=(bDeformGroup*)dg->next) {
 
 /*             dg->data no longer exists needs update
                        dg->data = (void*)get_named_bone(m_armobj->GetArmature(), dg->name); */
-//     }
+       }
                
-//             GB_validate_defgroups(m_bmesh, m_defbase);
+               GB_validate_defgroups(m_bmesh, m_defbase);
 }
index a61ebf59b22758cec152468e863cd8b4a65ca380..416266fef9c41fdd3522d8431b566cd1cf56691a 100644 (file)
@@ -71,9 +71,9 @@ public:
                                                m_defbase(&bmeshobj->defbase)
        {
                /* Build all precalculatable matrices for bones */
-/* XXX note: obsolete */
-//             GB_build_mats(bmeshobj->parent->obmat, bmeshobj->obmat, m_premat, m_postmat);
-//             GB_validate_defgroups((Mesh*)bmeshobj->data, m_defbase);
+
+               GB_build_mats(bmeshobj->parent->obmat, bmeshobj->obmat, m_premat, m_postmat);
+               GB_validate_defgroups((Mesh*)bmeshobj->data, m_defbase);
                // Validate bone data in bDeformGroups
 /*
                for (bDeformGroup *dg=(bDeformGroup*)m_defbase->first; dg; dg=(bDeformGroup*)dg->next)
@@ -91,9 +91,8 @@ public:
                                                m_lastUpdate(-1),
                                                m_defbase(&bmeshobj_old->defbase)
        {
-/* XXX note: obsolete */
-//             GB_build_mats(bmeshobj_new->parent->obmat, bmeshobj_new->obmat, m_premat, m_postmat);
-//             GB_validate_defgroups((Mesh*)bmeshobj_old->data, m_defbase);
+               GB_build_mats(bmeshobj_new->parent->obmat, bmeshobj_new->obmat, m_premat, m_postmat);
+               GB_validate_defgroups((Mesh*)bmeshobj_old->data, m_defbase);
        };
 
        virtual void ProcessReplica();
@@ -104,9 +103,8 @@ public:
 
 protected:
        BL_ArmatureObject               *m_armobj;                      //      Our parent object
-/* XXX note obsolete */
-//     float                                   m_premat[4][4];
-//     float                                   m_postmat[4][4];
+       float                                   m_premat[4][4];
+       float                                   m_postmat[4][4];
        float                                   m_time;
        double                                  m_lastUpdate;
        ListBase                                *m_defbase;
index b1eeff207668b1cde924fa0f006a616bb8c80c64..d01ff1626d79dc068488bceffe24b62dcc290207 100644 (file)
 #include <config.h>
 #endif
 
-unsigned int KX_Hash(void * inDWord)
+unsigned int KX_Hash(unsigned int inDWord)
 {
-#if defined(_WIN64)
-       unsigned __int64 key = (unsigned __int64)inDWord;
-#else
-       unsigned long key = (unsigned long)inDWord;
-#endif
-
+       unsigned int key = inDWord;
        key += ~(key << 16);
        key ^=  (key >>  5);
        key +=  (key <<  3);
        key ^=  (key >> 13);
        key += ~(key <<  9);
        key ^=  (key >> 17);
+       return key;
+};
 
-       return (unsigned int)(key & 0xffffffff);
-}
 
 
 CHashedPtr::CHashedPtr(void* val) : m_valptr(val)
@@ -62,5 +57,5 @@ CHashedPtr::CHashedPtr(void* val) : m_valptr(val)
 
 unsigned int CHashedPtr::hash() const
 {
-       return KX_Hash(m_valptr);
+       return KX_Hash((unsigned int) m_valptr);
 }
index 06e86854d82a55c47961778fac4a910758962152..18d183c2ae8d65993f97af8aa4fd317d79cab43b 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __KX_HASHEDPTR
 #define __KX_HASHEDPTR
 
-unsigned int                   KX_Hash(void * inDWord);
+unsigned int                   KX_Hash(unsigned int inDWord);
 
 class CHashedPtr
 {
index 38064739ff071d28980963734323d96c11f1ece4..425493dbe7e8c235b5130ff13d0506f9d63f5538 100644 (file)
 #include <config.h>
 #endif
 
-#if defined(_WIN64)
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
 bool KX_CameraIpoSGController::Update(double currentTime)
 {
        if (m_modified)
@@ -98,10 +92,10 @@ SG_Controller*      KX_CameraIpoSGController::GetReplica(class SG_Node* destnode)
                iporeplica->AddInterpolator(copyipo);
 
                MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-               uint_ptr orgbase = (uint_ptr)this;
-               uint_ptr orgloc = (uint_ptr)scaal;
-               uint_ptr offset = orgloc-orgbase;
-               uint_ptr newaddrbase = (uint_ptr)iporeplica + offset;
+               int orgbase = (int)this;
+               int orgloc = (int)scaal;
+               int offset = orgloc-orgbase;
+               int newaddrbase = (int)iporeplica + offset;
                MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
                copyipo->SetNewTarget((MT_Scalar*)blaptr);
        }
index 939171519328c38222bd31daa9bd81408b620dbf..da81439fccb852a40ddf8afd2fd848d87dce003d 100644 (file)
 #include <config.h>
 #endif
 
-#if defined(_WIN64)
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
 #ifdef WIN32
 // This warning tells us about truncation of __long__ stl-generated names.
 // It can occasionally cause DevStudio to have internal compiler warnings.
@@ -1074,12 +1068,12 @@ PyObject* KX_GameObject::PyGetPhysicsId(PyObject* self,
                                                                                           PyObject* kwds)
 {
        KX_IPhysicsController* ctrl = GetPhysicsController();
-       uint_ptr physid=0;
+       int physid=0;
        if (ctrl)
        {
-               physid= (uint_ptr)ctrl->GetUserData();
+               physid= (int)ctrl->GetUserData();
        }
-       return PyInt_FromLong((long)physid);
+       return PyInt_FromLong(physid);
 }
 
 KX_PYMETHODDEF_DOC(KX_GameObject, getDistanceTo,
index 920a65be0fbd6b7f8781dcd776a64c8362fded68..e54fb11dc1436bb4e6a3a326b09b17a44df92893 100644 (file)
 #include <config.h>
 #endif
 
-#if defined(_WIN64)
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
 #ifdef WIN32
 // This warning tells us about truncation of __long__ stl-generated names.
 // It can occasionally cause DevStudio to have internal compiler warnings.
@@ -174,10 +168,10 @@ SG_Controller*    KX_IpoSGController::GetReplica(class SG_Node* destnode)
                iporeplica->AddInterpolator(copyipo);
 
                MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-               uint_ptr orgbase = (uint_ptr)&m_ipo_xform;
-               uint_ptr orgloc = (uint_ptr)scaal;
-               uint_ptr offset = orgloc-orgbase;
-               uint_ptr newaddrbase = (uint_ptr)&iporeplica->m_ipo_xform;
+               int orgbase = (int)&m_ipo_xform;
+               int orgloc = (int)scaal;
+               int offset = orgloc-orgbase;
+               int newaddrbase = (int)&iporeplica->m_ipo_xform;
                newaddrbase += offset;
                MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
                copyipo->SetNewTarget((MT_Scalar*)blaptr);
index 45865b7a6823a03133ead2b16463d1e1cba1c507..e1bb3329ca84f967f5ee02b9868a778697e973fa 100644 (file)
 #include <config.h>
 #endif
 
-#if defined(_WIN64)
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
 bool KX_LightIpoSGController::Update(double currentTime)
 {
        if (m_modified)
@@ -103,10 +97,10 @@ SG_Controller*     KX_LightIpoSGController::GetReplica(class SG_Node* destnode)
                iporeplica->AddInterpolator(copyipo);
 
                MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-               uint_ptr orgbase = (uint_ptr)this;
-               uint_ptr orgloc = (uint_ptr)scaal;
-               uint_ptr offset = orgloc-orgbase;
-               uint_ptr newaddrbase = (uint_ptr)iporeplica + offset;
+               int orgbase = (int)this;
+               int orgloc = (int)scaal;
+               int offset = orgloc-orgbase;
+               int newaddrbase = (int)iporeplica + offset;
                MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
                copyipo->SetNewTarget((MT_Scalar*)blaptr);
        }
index b6d385da8ca49ed4c83b93c109a129c607b2dadd..58c1494724c2ba8f6323e3eb6672d92afb6a8356 100644 (file)
 #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)
@@ -94,10 +87,10 @@ SG_Controller*      KX_ObColorIpoSGController::GetReplica(class SG_Node* destnode)
                iporeplica->AddInterpolator(copyipo);
 
                MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-               uint_ptr orgbase = (uint_ptr)this;
-               uint_ptr orgloc = (uint_ptr)scaal;
-               uint_ptr offset = orgloc-orgbase;
-               uint_ptr newaddrbase = (uint_ptr)iporeplica + offset;
+               int orgbase = (int)this;
+               int orgloc = (int)scaal;
+               int offset = orgloc-orgbase;
+               int newaddrbase = (int)iporeplica + offset;
                MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
                copyipo->SetNewTarget((MT_Scalar*)blaptr);
        }
index 2317f9c3a9cae89e4c34624cff2b3e22fb3e321b..f11a9a763fe84f3665ffc2696ce9d981e9b16626 100644 (file)
@@ -352,17 +352,13 @@ static PyObject* gPyRemoveConstraint(PyObject* self,
                                                                                 PyObject* args, 
                                                                                 PyObject* kwds)
 {
-#if defined(_WIN64)
-       __int64 constraintid;
-       if (PyArg_ParseTuple(args,"L",&constraintid))
-#else
-       long constraintid;
-       if (PyArg_ParseTuple(args,"l",&constraintid))
-#endif
+       int constraintid;
+       
+       if (PyArg_ParseTuple(args,"i",&constraintid))
        {
                if (PHY_GetActiveEnvironment())
                {
-                       PHY_GetActiveEnvironment()->removeConstraint((void *)constraintid);
+                       PHY_GetActiveEnvironment()->removeConstraint(constraintid);
                }
        }
        Py_INCREF(Py_None); return Py_None;
index ded251f391e4dbf6bf418fe2b79e0579d7c3b804..c4800dc9d91591ee2f0241b612fb62088b5c473f 100644 (file)
 #include <config.h>
 #endif
 
-#if defined(_WIN64)
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
 bool KX_WorldIpoController::Update(double currentTime)
 {
        if (m_modified)
@@ -98,10 +92,10 @@ SG_Controller*      KX_WorldIpoController::GetReplica(class SG_Node* destnode)
                iporeplica->AddInterpolator(copyipo);
 
                MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-               uint_ptr orgbase = (uint_ptr)this;
-               uint_ptr orgloc = (uint_ptr)scaal;
-               uint_ptr offset = orgloc-orgbase;
-               uint_ptr newaddrbase = (uint_ptr)iporeplica + offset;
+               int orgbase = (int)this;
+               int orgloc = (int)scaal;
+               int offset = orgloc-orgbase;
+               int newaddrbase = (int)iporeplica + offset;
                MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
                copyipo->SetNewTarget((MT_Scalar*)blaptr);
        }
index bddc1e03be1be535d740d4e02477f89f3e85fa7f..2214d642d7b858aaff229a3913aee8bd6c4106a6 100644 (file)
@@ -53,7 +53,7 @@ public:
                        float pivotX,float pivotY,float pivotZ,
                        float axisX,float axisY,float axisZ);
 
-       virtual void            removeConstraint(void * constraintid);
+       virtual void            removeConstraint(int constraintid);
        virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient,float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
                                                                        float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
 
index c375abbdb164a47e053688bc089805205ff59faa..c1bfa43d788143f92f22b7a8b18f71879086298f 100644 (file)
@@ -192,7 +192,7 @@ void        CcdPhysicsEnvironment::removeCcdPhysicsController(CcdPhysicsController* ctr
                        if  ((&p2p->GetRigidBodyA() == ctrl->GetRigidBody() ||
                                (&p2p->GetRigidBodyB() == ctrl->GetRigidBody())))
                        {
-                                removeConstraint(p2p);
+                               removeConstraint(int(p2p));
                                //only 1 constraint per constroller
                                break;
                        }
@@ -209,7 +209,7 @@ void        CcdPhysicsEnvironment::removeCcdPhysicsController(CcdPhysicsController* ctr
                        if  ((&p2p->GetRigidBodyA() == ctrl->GetRigidBody() ||
                                (&p2p->GetRigidBodyB() == ctrl->GetRigidBody())))
                        {
-                               removeConstraint(p2p);
+                               removeConstraint(int(p2p));
                                //only 1 constraint per constroller
                                break;
                        }
@@ -768,11 +768,13 @@ int                       CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl
        
 }
 
-void           CcdPhysicsEnvironment::removeConstraint(void* p2p)
+void           CcdPhysicsEnvironment::removeConstraint(int constraintid)
 {
+       
+       Point2PointConstraint* p2p = (Point2PointConstraint*) constraintid;
+       
        std::vector<Point2PointConstraint*>::iterator i =
-               std::find(m_p2pConstraints.begin(), m_p2pConstraints.end(), 
-                               (Point2PointConstraint *)p2p);
+               std::find(m_p2pConstraints.begin(), m_p2pConstraints.end(), p2p);
        
        if (!(i == m_p2pConstraints.end()) )
        {
index 8e52642111662604fe33204c7b486a0ef8d193cd..8bacbad89147da2609e08ee7f3f00a9e7a0d1050 100644 (file)
@@ -75,7 +75,7 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment
                virtual int                     createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type,
                        float pivotX,float pivotY,float pivotZ,
                        float axisX,float axisY,float axisZ);
-           virtual void                removeConstraint(void* constraintid);
+               virtual void            removeConstraint(int constraintid);
 
 
                virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
index 0b6f8a4ded4c09d7ef5488cbf4a104e344ad8932..a640acd9b3d66d489472604e27d7744bca820dd2 100644 (file)
@@ -101,7 +101,7 @@ int                 DummyPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ct
 
 }
 
-void           DummyPhysicsEnvironment::removeConstraint(void * constraintid)
+void           DummyPhysicsEnvironment::removeConstraint(int constraintid)
 {
        if (constraintid)
        {
index 0a359feea6d4a9bdab0f28b38c4a4eb39d93119d..fde27e822d6fe37d7ad08c8602a0694198794182 100644 (file)
@@ -61,7 +61,7 @@ public:
                        float pivotX,float pivotY,float pivotZ,
                        float axisX,float axisY,float axisZ);
 
-       virtual void            removeConstraint(void * constraintid);
+       virtual void            removeConstraint(int constraintid);
        virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
                                                                        float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
 
index 8d03fd4b0f4b86b6ffb7acdbd70a5d8171cb065f..6cd5d513357bbbb0797b7966b329d1c7ce0b69e3 100644 (file)
@@ -117,7 +117,7 @@ int SumoPhysicsEnvironment::createConstraint(
        return constraintid;
 }
 
-void SumoPhysicsEnvironment::removeConstraint(void * constraintid)
+void SumoPhysicsEnvironment::removeConstraint(int constraintid)
 {
        if (constraintid)
        {
index c93e34825b922e8b6c697d561bdde8bb189004f8..62672d8ba489a9f411c2377a8613d499cc6196b9 100644 (file)
@@ -66,7 +66,7 @@ public:
                        float pivotX,float pivotY,float pivotZ,
                        float axisX,float axisY,float axisZ);
 
-       virtual void            removeConstraint(void * constraintid);
+       virtual void            removeConstraint(int constraintid);
        virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient,float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
                                                                        float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
 
index 1158563527abc31073be40b50509aca2c32ce929..c847e638bce9c9664e8dc3e596d96255b5dbe75e 100644 (file)
@@ -83,7 +83,7 @@ class PHY_IPhysicsEnvironment
                virtual int                     createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type,
                        float pivotX,float pivotY,float pivotZ,
                        float axisX,float axisY,float axisZ)=0;
-               virtual void            removeConstraint(void * constraintid)=0;
+               virtual void            removeConstraint(int constraintid)=0;
 
                virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
                                                                                float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ)=0;
index 4da40e6696d55a50aef95d12fcc5544267cab1fa..f852530fa5352cee2b4972b578dacc3456a12ac8 100644 (file)
 #include <config.h>
 #endif
 
-//
-// Build hash index from pointer.  Even though the final result
-// is a 32-bit integer, use all the bits of the pointer as long
-// as possible.
-//
-
-unsigned int GEN_Hash(void * inDWord)
+unsigned int GEN_Hash(unsigned int inDWord)
 {
-#if defined(_WIN64)
-       unsigned __int64 key = (unsigned __int64)inDWord;
-#else
-       unsigned long key = (unsigned long)inDWord;
-#endif
+       unsigned int key = inDWord;
 
        key += ~(key << 16);
        key ^=  (key >>  5);
@@ -57,5 +47,5 @@ unsigned int GEN_Hash(void * inDWord)
        key += ~(key <<  9);
        key ^=  (key >> 17);
 
-       return (unsigned int)(key & 0xffffffff);
+       return key;
 }
index 51a8990540996d3e3bcb895f232f8aa6e405b73a..8fabc9a551646a5e02d489131586e5228643abd0 100644 (file)
 #ifndef __GEN_HASHEDPTR
 #define __GEN_HASHEDPTR
 
-unsigned int GEN_Hash(void * inDWord);
+unsigned int GEN_Hash(unsigned int inDWord);
 
 class GEN_HashedPtr
 {
        void* m_valptr;
 public:
        GEN_HashedPtr(void* val) : m_valptr(val) {};
-       unsigned int hash() const { return GEN_Hash(m_valptr);};
+       unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);};
        inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
 };
 
index ab48ec348a728c3097a4a132eeed41b8723b7426..71d59acc8db4e788376706b7e81ba8d6ff3fc945 100644 (file)
@@ -415,7 +415,7 @@ endif
     export ID = $(LOGNAME)
     export NAN_PYTHON ?= $(LCGDIR)/python
     export NAN_ICONV ?= $(LCGDIR)/iconv
-    export NAN_PYTHON_VERSION ?= 2.4
+    export NAN_PYTHON_VERSION ?= 2.3
     ifeq ($(FREE_WINDOWS), true)
       export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
       export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
index 3449ca679eff597a72df80570ae8cecc674db299..598eafb9f980f34d7898090b288e03215145266c 100644 (file)
@@ -62,7 +62,6 @@ def preparedist():
                shutil.copy("../lib/windows/python/lib/python24.dll", "dist/python24.dll")
                shutil.copy("../lib/windows/sdl/lib/SDL.dll", "dist/SDL.dll")
                shutil.copy("../lib/windows/gettext/lib/gnu_gettext.dll", "dist/gnu_gettext.dll")
-               shutil.copy("../lib/windows/tiff/lib/libtiff.dll", "dist/libtiff.dll")
        elif sys.platform in ['linux2', 'linux-i386', 'freebsd4', 'freebsd5']:
                shutil.copy("blender", "dist/blender")
                if bs_globals.user_options_dict['BUILD_BLENDER_PLAYER'] == 1: