Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 42 insertions, 38 deletions

diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c
index ee1ac8f0ae2..9c08a0b2f9d 100644
--- a/source/blender/blenpluginapi/intern/pluginapi.c
+++ b/source/blender/blenpluginapi/intern/pluginapi.c
@@ -50,9 +50,12 @@
 #include "plugin.h"
 #include "MEM_guardedalloc.h"
 
+#include "BLO_sys_types.h" // needed for intptr_t
+
 #include "BLI_blenlib.h"  /* util and noise functions */
 #include "BLI_threads.h"  /* For threadsfe guardedalloc malloc/calloc/free */
 #include "IMB_imbuf.h"    /* image buffer stuff       */
+#define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i)) /* should use BKE_utildefines.h */
 
 /* -------------------------------------------------------------------------- */
 /* stuff from util.h                                                          */ 
@@ -321,42 +324,43 @@ int pluginapi_force_ref(void);
 
 int pluginapi_force_ref(void) 
 {
-	return (int) mallocN +
-		(int) callocN +
-		(int) freeN +
-		(int) mallocT +
-		(int) callocT +
-		(int) freeT +
-		(int) allocImBuf +
-		(int) dupImBuf +
-		(int) freeImBuf +
-		(int) converttocmap +
-		(int) saveiff +
-		(int) loadiffmem +
-		(int) loadifffile +
-		(int) loadiffname +
-		(int) testiffname +
-		(int) onehalf +
-		(int) onethird +
-		(int) halflace +
-		(int) half_x +
-		(int) half_y +
-		(int) double_x +
-		(int) double_y +
-		(int) double_fast_x +
-		(int) double_fast_y +
-		(int) ispic +
-		(int) dit2 +
-		(int) dit0 +
-		(int) scaleImBuf +
-		(int) scalefastImBuf +
-		(int) scalefieldImBuf +
-		(int) scalefastfieldImBuf +
-		(int) hnoise +
-		(int) hnoisep +
-		(int) turbulence +
-		(int) turbulence1 +
-		(int) de_interlace +
-		(int) interlace +
-		(int) gamwarp;
+	return 
+		GET_INT_FROM_POINTER( mallocN ) +
+		GET_INT_FROM_POINTER( callocN ) +
+		GET_INT_FROM_POINTER( freeN ) +
+		GET_INT_FROM_POINTER( mallocT ) +
+		GET_INT_FROM_POINTER( callocT ) +
+		GET_INT_FROM_POINTER( freeT ) +
+		GET_INT_FROM_POINTER( allocImBuf ) +
+		GET_INT_FROM_POINTER( dupImBuf ) +
+		GET_INT_FROM_POINTER( freeImBuf ) +
+		GET_INT_FROM_POINTER( converttocmap ) +
+		GET_INT_FROM_POINTER( saveiff ) +
+		GET_INT_FROM_POINTER( loadiffmem ) +
+		GET_INT_FROM_POINTER( loadifffile ) +
+		GET_INT_FROM_POINTER( loadiffname ) +
+		GET_INT_FROM_POINTER( testiffname ) +
+		GET_INT_FROM_POINTER( onehalf ) +
+		GET_INT_FROM_POINTER( onethird ) +
+		GET_INT_FROM_POINTER( halflace ) +
+		GET_INT_FROM_POINTER( half_x ) +
+		GET_INT_FROM_POINTER( half_y ) +
+		GET_INT_FROM_POINTER( double_x ) +
+		GET_INT_FROM_POINTER( double_y ) +
+		GET_INT_FROM_POINTER( double_fast_x ) +
+		GET_INT_FROM_POINTER( double_fast_y ) +
+		GET_INT_FROM_POINTER( ispic ) +
+		GET_INT_FROM_POINTER( dit2 ) +
+		GET_INT_FROM_POINTER( dit0 ) +
+		GET_INT_FROM_POINTER( scaleImBuf ) +
+		GET_INT_FROM_POINTER( scalefastImBuf ) +
+		GET_INT_FROM_POINTER( scalefieldImBuf ) +
+		GET_INT_FROM_POINTER( scalefastfieldImBuf ) +
+		GET_INT_FROM_POINTER( hnoise ) +
+		GET_INT_FROM_POINTER( hnoisep ) +
+		GET_INT_FROM_POINTER( turbulence ) +
+		GET_INT_FROM_POINTER( turbulence1 ) +
+		GET_INT_FROM_POINTER( de_interlace ) +
+		GET_INT_FROM_POINTER( interlace ) +
+		GET_INT_FROM_POINTER( gamwarp );
 }