diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/python/api2_2x/Draw.c | 2 | ||||
-rw-r--r-- | source/blender/src/buttons_editing.c | 10 | ||||
-rw-r--r-- | source/blender/src/buttons_object.c | 16 | ||||
-rw-r--r-- | source/blender/src/buttons_scene.c | 8 | ||||
-rw-r--r-- | source/blender/src/buttons_shading.c | 8 | ||||
-rw-r--r-- | source/blender/src/interface_icons.c | 2 | ||||
-rw-r--r-- | source/blender/src/toolbox.c | 8 | ||||
-rw-r--r-- | source/blender/src/vpaint.c | 4 |
8 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/python/api2_2x/Draw.c b/source/blender/python/api2_2x/Draw.c index e8a7571c59f..e547aafb998 100644 --- a/source/blender/python/api2_2x/Draw.c +++ b/source/blender/python/api2_2x/Draw.c @@ -512,7 +512,7 @@ static int Button_setattr( PyObject * self, char *name, PyObject * v ) char *newstr; unsigned int newlen; - PyString_AsStringAndSize( v, &newstr, &newlen ); + PyString_AsStringAndSize( v, &newstr, (int *)&newlen ); if (newlen+1> UI_MAX_DRAW_STR) return EXPP_ReturnIntError( PyExc_ValueError, "Error: button string length exceeded max limit (399 chars)."); diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index ef7f7ca4194..1f813e401ba 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -4355,7 +4355,7 @@ static void editing_panel_links(Object *ob) uiBlockBeginAlign(block); - uiDefButS(block, MENU, B_MAKEDISP, menustr, 143, 132,18,21, &ob->actdef, 1, defCount, 0, 0, "Browses available vertex groups"); + uiDefButS(block, MENU, B_MAKEDISP, menustr, 143, 132,18,21, (short *)&ob->actdef, 1, defCount, 0, 0, "Browses available vertex groups"); MEM_freeN (menustr); if (ob->actdef){ @@ -5210,11 +5210,11 @@ void editing_panel_mesh_multires() uiButSetFunc(but,multires_del_higher,ob,me); cy-= 20; - but= uiDefButC(block,NUM,B_NOP,"Level: ",cx,cy,200,19,&me->mr->newlvl,1.0,me->mr->level_count,0,0,""); + but= uiDefButC(block,NUM,B_NOP,"Level: ",cx,cy,200,19,(char *)&me->mr->newlvl,1.0,me->mr->level_count,0,0,""); uiButSetFunc(but,multires_set_level_cb, ob, me); cy-= 20; - but= uiDefButC(block,NUM,B_NOP,"Edges: ",cx,cy,200,19,&me->mr->edgelvl,1.0,me->mr->level_count,0,0,"Set level of edges to display"); + but= uiDefButC(block,NUM,B_NOP,"Edges: ",cx,cy,200,19,(char *)&me->mr->edgelvl,1.0,me->mr->level_count,0,0,"Set level of edges to display"); uiButSetFunc(but,multires_edge_level_update,ob,me); cy-= 20; uiBlockEndAlign(block); @@ -5224,10 +5224,10 @@ void editing_panel_mesh_multires() cy-= 20; uiBlockBeginAlign(block); - uiDefButC(block,NUM,B_NOP,"Pin: ",cx,cy,200,19,&me->mr->pinlvl,1.0,me->mr->level_count,0,0,"Set level to apply modifiers to during render"); + uiDefButC(block,NUM,B_NOP,"Pin: ",cx,cy,200,19,(char *)&me->mr->pinlvl,1.0,me->mr->level_count,0,0,"Set level to apply modifiers to during render"); cy-= 20; - uiDefButC(block,NUM,B_NOP,"Render: ",cx,cy,200,19,&me->mr->renderlvl,1.0,me->mr->level_count,0,0,"Set level to render"); + uiDefButC(block,NUM,B_NOP,"Render: ",cx,cy,200,19,(char *)&me->mr->renderlvl,1.0,me->mr->level_count,0,0,"Set level to render"); cy-= 20; if(multires_modifier_warning()) { diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 3c2c2be9373..de80909433f 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -1922,16 +1922,16 @@ static void object_panel_object(Object *ob) /* layers */ uiBlockBeginAlign(block); for(a=0; a<5; a++) - uiDefButBitI(block, TOG, 1<<a, REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<a, REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), (int *)&(group->layer), 0, 0, 0, 0, ""); for(a=0; a<5; a++) - uiDefButBitI(block, TOG, 1<<(a+10), REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<(a+10), REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), (int *)&(group->layer), 0, 0, 0, 0, ""); xco+= 7; uiBlockBeginAlign(block); for(a=5; a<10; a++) - uiDefButBitI(block, TOG, 1<<a, REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<a, REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 120-yco, (short)(dx/2), (short)(dy/2), (int *)&(group->layer), 0, 0, 0, 0, ""); for(a=5; a<10; a++) - uiDefButBitI(block, TOG, 1<<(a+10), REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), &(group->layer), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<(a+10), REDRAWVIEW3D, "", (short)(xco+a*(dx/2)), 105-yco, (short)(dx/2), (short)(dy/2), (int *)&(group->layer), 0, 0, 0, 0, ""); uiBlockEndAlign(block); @@ -2027,16 +2027,16 @@ static void object_panel_draw(Object *ob) uiBlockBeginAlign(block); for(a=0; a<5; a++) - uiDefButBitI(block, TOG, 1<<a, B_OBLAY+a, "", (short)(xco+a*(dx/2)), 180, (short)(dx/2), (short)(dy/2), &(BASACT->lay), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<a, B_OBLAY+a, "", (short)(xco+a*(dx/2)), 180, (short)(dx/2), (short)(dy/2), (int *)&(BASACT->lay), 0, 0, 0, 0, ""); for(a=0; a<5; a++) - uiDefButBitI(block, TOG, 1<<(a+10), B_OBLAY+a+10, "", (short)(xco+a*(dx/2)), 165, (short)(dx/2), (short)(dy/2), &(BASACT->lay), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<(a+10), B_OBLAY+a+10, "", (short)(xco+a*(dx/2)), 165, (short)(dx/2), (short)(dy/2), (int *)&(BASACT->lay), 0, 0, 0, 0, ""); xco+= 7; uiBlockBeginAlign(block); for(a=5; a<10; a++) - uiDefButBitI(block, TOG, 1<<a, B_OBLAY+a, "", (short)(xco+a*(dx/2)), 180, (short)(dx/2), (short)(dy/2), &(BASACT->lay), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<a, B_OBLAY+a, "", (short)(xco+a*(dx/2)), 180, (short)(dx/2), (short)(dy/2), (int *)&(BASACT->lay), 0, 0, 0, 0, ""); for(a=5; a<10; a++) - uiDefButBitI(block, TOG, 1<<(a+10), B_OBLAY+a+10, "", (short)(xco+a*(dx/2)), 165, (short)(dx/2), (short)(dy/2), &(BASACT->lay), 0, 0, 0, 0, ""); + uiDefButBitI(block, TOG, 1<<(a+10), B_OBLAY+a+10, "", (short)(xco+a*(dx/2)), 165, (short)(dx/2), (short)(dy/2), (int *)&(BASACT->lay), 0, 0, 0, 0, ""); uiBlockEndAlign(block); diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 1711ec7d4fb..2047fc5d9ad 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1810,22 +1810,22 @@ static void draw_3d_layer_buttons(uiBlock *block, unsigned int *poin, short xco, uiBlockBeginAlign(block); for(a=0; a<5; a++) { - bt= uiDefButBitI(block, TOG, 1<<a, B_NOP, "", (short)(xco+a*(dx/2)), yco+dy/2, (short)(dx/2), (short)(dy/2), poin, 0, 0, 0, 0, ""); + bt= uiDefButBitI(block, TOG, 1<<a, B_NOP, "", (short)(xco+a*(dx/2)), yco+dy/2, (short)(dx/2), (short)(dy/2), (int *)poin, 0, 0, 0, 0, ""); uiButSetFunc(bt, layer_copy_func, (void *)a, poin); } for(a=0; a<5; a++) { - bt=uiDefButBitI(block, TOG, 1<<(a+10), B_NOP, "", (short)(xco+a*(dx/2)), yco, (short)(dx/2), (short)(dy/2), poin, 0, 0, 0, 0, ""); + bt=uiDefButBitI(block, TOG, 1<<(a+10), B_NOP, "", (short)(xco+a*(dx/2)), yco, (short)(dx/2), (short)(dy/2), (int *)poin, 0, 0, 0, 0, ""); uiButSetFunc(bt, layer_copy_func, (void *)(a+10), poin); } xco+= 7; uiBlockBeginAlign(block); for(a=5; a<10; a++) { - bt=uiDefButBitI(block, TOG, 1<<a, B_NOP, "", (short)(xco+a*(dx/2)), yco+dy/2, (short)(dx/2), (short)(dy/2), poin, 0, 0, 0, 0, ""); + bt=uiDefButBitI(block, TOG, 1<<a, B_NOP, "", (short)(xco+a*(dx/2)), yco+dy/2, (short)(dx/2), (short)(dy/2), (int *)poin, 0, 0, 0, 0, ""); uiButSetFunc(bt, layer_copy_func, (void *)a, poin); } for(a=5; a<10; a++) { - bt=uiDefButBitI(block, TOG, 1<<(a+10), B_NOP, "", (short)(xco+a*(dx/2)), yco, (short)(dx/2), (short)(dy/2), poin, 0, 0, 0, 0, ""); + bt=uiDefButBitI(block, TOG, 1<<(a+10), B_NOP, "", (short)(xco+a*(dx/2)), yco, (short)(dx/2), (short)(dy/2), (int *)poin, 0, 0, 0, 0, ""); uiButSetFunc(bt, layer_copy_func, (void *)(a+10), poin); } diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 51e29f623bd..1a9763459d1 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1361,16 +1361,16 @@ static void texture_panel_envmap(Tex *tex) uiBlockBeginAlign(block); for(a=0; a<5; a++) - uiDefButBitI(block, TOG, 1<<a, 0, "", (xco+a*(dx/2)), (yco+dy/2), (dx/2), (1+dy/2), &env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); + uiDefButBitI(block, TOG, 1<<a, 0, "", (xco+a*(dx/2)), (yco+dy/2), (dx/2), (1+dy/2), (int *)&env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); for(a=0; a<5; a++) - uiDefButBitI(block, TOG, 1<<(a+10), 0, "",(xco+a*(dx/2)), yco, (dx/2), (dy/2), &env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); + uiDefButBitI(block, TOG, 1<<(a+10), 0, "",(xco+a*(dx/2)), yco, (dx/2), (dy/2), (int *)&env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); uiBlockBeginAlign(block); xco+= 5; for(a=5; a<10; a++) - uiDefButBitI(block, TOG, 1<<a, 0, "", (xco+a*(dx/2)), (yco+dy/2), (dx/2), (1+dy/2), &env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); + uiDefButBitI(block, TOG, 1<<a, 0, "", (xco+a*(dx/2)), (yco+dy/2), (dx/2), (1+dy/2), (int *)&env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); for(a=5; a<10; a++) - uiDefButBitI(block, TOG, 1<<(a+10), 0, "",(xco+a*(dx/2)), yco, (dx/2), (dy/2), &env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); + uiDefButBitI(block, TOG, 1<<(a+10), 0, "",(xco+a*(dx/2)), yco, (dx/2), (dy/2), (int *)&env->notlay, 0, 0, 0, 0, "Toggles layer visibility to environment map"); } } diff --git a/source/blender/src/interface_icons.c b/source/blender/src/interface_icons.c index e400ca9af74..d257f2f37f8 100644 --- a/source/blender/src/interface_icons.c +++ b/source/blender/src/interface_icons.c @@ -500,7 +500,7 @@ static void clear_icon_grid_margins(unsigned char *rect, int w, int h) static void prepare_internal_icons(ImBuf *bbuf) { - char *back= (char *)bbuf->rect; + unsigned char *back= (unsigned char *)bbuf->rect; /* this sets the icon grid margin area outside of icon to zero alpha */ clear_icon_grid_margins(back, bbuf->x, bbuf->y); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index f979e807925..a200e8d44eb 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -389,16 +389,16 @@ int movetolayer_buts(unsigned int *lay, char *title) /* buttons have 0 as return event, to prevent menu to close on hotkeys */ uiBlockBeginAlign(block); for(a=0; a<5; a++) - uiDefButBitI(block, TOGR, 1<<a, 0, "",(short)(x1+a*dx),(short)(y1+dy),(short)dx,(short)dy, lay, 0, 0, 0, 0, ""); + uiDefButBitI(block, TOGR, 1<<a, 0, "",(short)(x1+a*dx),(short)(y1+dy),(short)dx,(short)dy, (int *)lay, 0, 0, 0, 0, ""); for(a=0; a<5; a++) - uiDefButBitI(block, TOGR, 1<<(a+10), 0, "",(short)(x1+a*dx),(short)y1,(short)dx,(short)dy, lay, 0, 0, 0, 0, ""); + uiDefButBitI(block, TOGR, 1<<(a+10), 0, "",(short)(x1+a*dx),(short)y1,(short)dx,(short)dy, (int *)lay, 0, 0, 0, 0, ""); x1+= 5; uiBlockBeginAlign(block); for(a=5; a<10; a++) - uiDefButBitI(block, TOGR, 1<<a, 0, "",(short)(x1+a*dx),(short)(y1+dy),(short)dx,(short)dy, lay, 0, 0, 0, 0, ""); + uiDefButBitI(block, TOGR, 1<<a, 0, "",(short)(x1+a*dx),(short)(y1+dy),(short)dx,(short)dy, (int *)lay, 0, 0, 0, 0, ""); for(a=5; a<10; a++) - uiDefButBitI(block, TOGR, 1<<(a+10), 0, "",(short)(x1+a*dx),(short)y1,(short)dx,(short)dy, lay, 0, 0, 0, 0, ""); + uiDefButBitI(block, TOGR, 1<<(a+10), 0, "",(short)(x1+a*dx),(short)y1,(short)dx,(short)dy, (int *)lay, 0, 0, 0, 0, ""); uiBlockEndAlign(block); x1-= 5; diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c index 695fec5da75..20fb8cb2500 100644 --- a/source/blender/src/vpaint.c +++ b/source/blender/src/vpaint.c @@ -108,8 +108,8 @@ #define MAXINDEX 512000 -VPaint Gvp= {1.0, 1.0, 1.0, 0.2, 25.0, 1.0, 1.0, 0, VP_AREA+VP_SOFT+VP_SPRAY, NULL}; -VPaint Gwp= {1.0, 1.0, 1.0, 0.2, 25.0, 1.0, 1.0, 0, VP_AREA+VP_SOFT, NULL}; +VPaint Gvp= {1.0, 1.0, 1.0, 0.2, 25.0, 1.0, 1.0, 0, VP_AREA+VP_SOFT+VP_SPRAY, 0}; +VPaint Gwp= {1.0, 1.0, 1.0, 0.2, 25.0, 1.0, 1.0, 0, VP_AREA+VP_SOFT, 0}; static int *get_indexarray(void) { |