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, 10 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index f144d2badd1..b9e3c593ddf 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -48,6 +48,9 @@
 #include "BLI_ghash.h"
 
 #include "BKE_icons.h"
+#include "BKE_utildefines.h"
+
+#include "BLO_sys_types.h" // for intptr_t support
 
 #define GS(a)	(*((short *)(a)))
 
@@ -87,7 +90,7 @@ static int get_next_free_id()
 		return gNextIconId++;
 	
 	/* now we try to find the smallest icon id not stored in the gIcons hash */
-	while (BLI_ghash_lookup(gIcons, (void *)startId) && startId>=gFirstIconId) 
+	while (BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(startId)) && startId>=gFirstIconId) 
 		startId++;
 
 	/* if we found a suitable one that isnt used yet, return it */
@@ -216,7 +219,7 @@ void BKE_icon_changed(int id)
 	
 	if (!id) return;
 
-	icon = BLI_ghash_lookup(gIcons, (void *)id);
+	icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(id));
 	
 	if (icon)
 	{
@@ -258,7 +261,7 @@ int BKE_icon_getid(struct ID* id)
 	new_icon->drawinfo = 0;
 	new_icon->drawinfo_free = 0;
 
-	BLI_ghash_insert(gIcons, (void *)id->icon_id, new_icon);
+	BLI_ghash_insert(gIcons, SET_INT_IN_POINTER(id->icon_id), new_icon);
 	
 	return id->icon_id;
 }
@@ -267,7 +270,7 @@ Icon* BKE_icon_get(int icon_id)
 {
 	Icon* icon = 0;
 
-	icon = BLI_ghash_lookup(gIcons, (void*)icon_id);
+	icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(icon_id));
 	
 	if (!icon) {
 		printf("BKE_icon_get: Internal error, no icon for icon ID: %d\n", icon_id);
@@ -281,7 +284,7 @@ void BKE_icon_set(int icon_id, struct Icon* icon)
 {
 	Icon* old_icon = 0;
 
-	old_icon = BLI_ghash_lookup(gIcons, (void*)icon_id);
+	old_icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(icon_id));
 
 	if (old_icon)
 	{
@@ -289,7 +292,7 @@ void BKE_icon_set(int icon_id, struct Icon* icon)
 		return;
 	}
 
-	BLI_ghash_insert(gIcons, (void *)icon_id, icon);
+	BLI_ghash_insert(gIcons, SET_INT_IN_POINTER(icon_id), icon);
 }
 
 void BKE_icon_delete(struct ID* id)
@@ -297,6 +300,6 @@ void BKE_icon_delete(struct ID* id)
 
 	if (!id->icon_id) return; /* no icon defined for library object */
 
-	BLI_ghash_remove(gIcons, (void*)id->icon_id, 0, icon_free);
+	BLI_ghash_remove(gIcons, SET_INT_IN_POINTER(id->icon_id), 0, icon_free);
 	id->icon_id = 0;
 }