Revision: 14458
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14458
Author: khughes
Date: 2008-04-18 02:21:40 +0200 (Fri, 18 Apr 2008)
Log Message:
-----------
More changes to GET_INT_FROM_POINTER and SET_INT_IN_POINTER to get rid of
other warnings that only occurred with 64bit systems. Wish I'd known about
these macros earlier!
Modified Paths:
--------------
trunk/blender/source/blender/src/booleanops.c
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/buttons_logic.c
trunk/blender/source/blender/src/buttons_scene.c
trunk/blender/source/blender/src/drawimage.c
trunk/blender/source/blender/src/editface.c
Modified: trunk/blender/source/blender/src/booleanops.c
===================================================================
--- trunk/blender/source/blender/src/booleanops.c 2008-04-17 21:15:53 UTC
(rev 14457)
+++ trunk/blender/source/blender/src/booleanops.c 2008-04-18 00:21:40 UTC
(rev 14458)
@@ -396,10 +396,10 @@
if (!BLI_ghash_haskey(material_hash, orig_mat)) {
mat[*totmat] = orig_mat;
mat_nr = mface->mat_nr = (*totmat)++;
- BLI_ghash_insert(material_hash, orig_mat,
(void*)mat_nr);
+ BLI_ghash_insert(material_hash, orig_mat,
SET_INT_IN_POINTER(mat_nr));
}
else
- mface->mat_nr =
(int)BLI_ghash_lookup(material_hash, orig_mat);
+ mface->mat_nr =
GET_INT_FROM_POINTER(BLI_ghash_lookup(material_hash, orig_mat));
}
else
mface->mat_nr = 0;
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2008-04-17 21:15:53 UTC
(rev 14457)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-04-18 00:21:40 UTC
(rev 14458)
@@ -4161,13 +4161,13 @@
for(a=0; a<8; a++) {
short dx= 18;
but= uiDefButBitS(block, BUT_TOGDUAL, 1<<a, REDRAWVIEW3D, "",
10+a*dx, 115, dx, 15, &arm->layer, 0, 0, 0, 0, "Armature layer (Hold Ctrl for
locking in a proxy instance)");
- uiButSetFunc(but, armature_layer_cb, &arm->layer, (void
*)(1<<a));
+ uiButSetFunc(but, armature_layer_cb, &arm->layer,
SET_INT_IN_POINTER(1<<a));
}
uiBlockBeginAlign(block);
for(a=8; a<16; a++) {
short dx= 18;
but= uiDefButBitS(block, BUT_TOGDUAL, 1<<a, REDRAWVIEW3D, "",
18+a*dx, 115, dx, 15, &arm->layer, 0, 0, 0, 0, "Armature layer (Hold Ctrl for
locking in a proxy instance)");
- uiButSetFunc(but, armature_layer_cb, &arm->layer, (void
*)(1<<a));
+ uiButSetFunc(but, armature_layer_cb, &arm->layer,
SET_INT_IN_POINTER(1<<a));
}
/* quite bad here, but I don't know a better place for copy... */
if(ob->pose)
@@ -4367,13 +4367,13 @@
for(a=0; a<8; a++) {
short dx= 21;
but= uiDefButBitS(block, TOG, 1<<a,
REDRAWVIEW3D, "", -10+a*dx, by-57, dx, 15, &curBone->layer, 0, 0, 0, 0,
"Armature layer that bone exists on");
- uiButSetFunc(but, armature_layer_cb,
&curBone->layer, (void *)(1<<a));
+ uiButSetFunc(but, armature_layer_cb,
&curBone->layer, SET_INT_IN_POINTER(1<<a));
}
uiBlockBeginAlign(block);
for(a=8; a<16; a++) {
short dx= 21;
but= uiDefButBitS(block, TOG, 1<<a,
REDRAWVIEW3D, "", -6+a*dx, by-57, dx, 15, &curBone->layer, 0, 0, 0, 0,
"Armature layer that bone exists on");
- uiButSetFunc(but, armature_layer_cb,
&curBone->layer, (void *)(1<<a));
+ uiButSetFunc(but, armature_layer_cb,
&curBone->layer, SET_INT_IN_POINTER(1<<a));
}
uiBlockEndAlign(block);
@@ -4470,13 +4470,13 @@
for(a=0; a<8; a++) {
short dx= 21;
but= uiDefButBitS(block, TOG, 1<<a,
REDRAWVIEW3D, "", -10+a*dx, by-57, dx, 15, &curBone->layer, 0, 0, 0, 0,
"Armature layer that bone exists on");
- uiButSetFunc(but, armature_layer_cb,
&curBone->layer, (void *)(1<<a));
+ uiButSetFunc(but, armature_layer_cb,
&curBone->layer, SET_INT_IN_POINTER(1<<a));
}
uiBlockBeginAlign(block);
for(a=8; a<16; a++) {
short dx= 21;
but= uiDefButBitS(block, TOG, 1<<a,
REDRAWVIEW3D, "", -6+a*dx, by-57, dx, 15, &curBone->layer, 0, 0, 0, 0,
"Armature layer that bone exists on");
- uiButSetFunc(but, armature_layer_cb,
&curBone->layer, (void *)(1<<a));
+ uiButSetFunc(but, armature_layer_cb,
&curBone->layer, SET_INT_IN_POINTER(1<<a));
}
uiBlockEndAlign(block);
@@ -4994,7 +4994,7 @@
int y = 90 - 20 * i;
but = uiDefIconBut(block, BUT, B_MODIFIER_RECALC,
VICON_MOVE_DOWN, 1025, y, 16, 19, NULL, 0.0, 0.0, 0.0, 0.0,
"Change the order the subdivisions algorithm are applied");
- uiButSetFunc(but, skgen_reorder, (void *)i, NULL);
+ uiButSetFunc(but, skgen_reorder, SET_INT_IN_POINTER(i), NULL);
switch(G.scene->toolsettings->skgen_subdivisions[i])
{
Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c 2008-04-17 21:15:53 UTC
(rev 14457)
+++ trunk/blender/source/blender/src/buttons_logic.c 2008-04-18 00:21:40 UTC
(rev 14458)
@@ -64,6 +64,8 @@
#include "BKE_main.h"
#include "BKE_sca.h"
#include "BKE_property.h"
+#include "BKE_property.h"
+#include "BKE_utildefines.h"
#include "BIF_gl.h"
#include "BIF_resources.h"
@@ -215,7 +217,7 @@
static void make_unique_prop_names_cb(void *strv, void *redraw_view3d_flagv)
{
char *str= strv;
- int redraw_view3d_flag= (int) redraw_view3d_flagv;
+ int redraw_view3d_flag= GET_INT_FROM_POINTER(redraw_view3d_flagv);
make_unique_prop_names(str);
if (redraw_view3d_flag) allqueue(REDRAWVIEW3D, 0);
Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c 2008-04-17 21:15:53 UTC
(rev 14457)
+++ trunk/blender/source/blender/src/buttons_scene.c 2008-04-18 00:21:40 UTC
(rev 14458)
@@ -2711,7 +2711,7 @@
static void layer_copy_func(void *lay_v, void *lay_p)
{
unsigned int *lay= lay_p;
- int laybit= (int)lay_v;
+ int laybit= GET_INT_FROM_POINTER(lay_v);
if(G.qual & (LR_SHIFTKEY|LR_CTRLKEY)) {
if(*lay==0) *lay= 1<<laybit;
Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c 2008-04-17 21:15:53 UTC
(rev 14457)
+++ trunk/blender/source/blender/src/drawimage.c 2008-04-18 00:21:40 UTC
(rev 14458)
@@ -897,7 +897,7 @@
glLineWidth(1);
col2[0] = col2[1] = col2[2] = 128; col2[3] = 255;
- glColor4ubv(col2);
+ glColor4ubv((unsigned char *)col2);
if (G.f & G_DRAWEDGES) {
glShadeModel(GL_SMOOTH);
Modified: trunk/blender/source/blender/src/editface.c
===================================================================
--- trunk/blender/source/blender/src/editface.c 2008-04-17 21:15:53 UTC (rev
14457)
+++ trunk/blender/source/blender/src/editface.c 2008-04-18 00:21:40 UTC (rev
14458)
@@ -908,7 +908,7 @@
if (cost[adjnum] > newcost) {
cost[adjnum] = newcost;
prevedge[adjnum] = mednum;
- BLI_heap_insert(heap, newcost, (void*)adjnum);
+ BLI_heap_insert(heap, newcost,
SET_INT_IN_POINTER(adjnum));
}
}
}
@@ -973,11 +973,11 @@
/* regular dijkstra shortest path, but over edges instead of vertices */
heap = BLI_heap_new();
- BLI_heap_insert(heap, 0.0f, (void*)source);
+ BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(source));
cost[source] = 0.0f;
while (!BLI_heap_empty(heap)) {
- mednum = (int)BLI_heap_popmin(heap);
+ mednum = GET_INT_FROM_POINTER(BLI_heap_popmin(heap));
med = me->medge + mednum;
if (mednum == target)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
