griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: minor changes to get trunk compiling with strict warnings.

Browse Source
This commit is contained in:
Campbell Barton
2012-05-03 19:47:16 +00:00
parent b1006fb949
commit dfb3e41cf9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/sculpt_paint/paint_intern.h
View File

@@ -53,7 +53,7 @@ struct wmOperatorType;
typedef int (*StrokeGetLocation)(struct bContext *C, float location[3], float mouse[2]);
typedef int (*StrokeTestStart)(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
typedef void (*StrokeUpdateStep)(struct bContext *C, struct PaintStroke *stroke, struct PointerRNA *itemptr);
typedef void (*StrokeDone)(struct bContext *C, struct PaintStroke *stroke);
typedef void (*StrokeDone)(const struct bContext *C, struct PaintStroke *stroke);
struct PaintStroke *paint_stroke_new(struct bContext *C,
StrokeGetLocation get_location, StrokeTestStart test_start,

8
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -267,7 +267,7 @@ typedef struct StrokeCache {
/*** paint mesh ***/
static void paint_mesh_restore_co(Sculpt *sd, SculptSession *ss)
static void paint_mesh_restore_co(SculptSession *ss)
{
StrokeCache *cache = ss->cache;
int i;
@@ -3373,7 +3373,7 @@ static void sculpt_restore_mesh(Sculpt *sd, SculptSession *ss)
brush_use_size_pressure(ss->cache->vc->scene, brush)) ||
(brush->flag & BRUSH_RESTORE_MESH))
{
paint_mesh_restore_co(sd, ss);
paint_mesh_restore_co(ss);
}
}
@@ -3483,7 +3483,7 @@ static void sculpt_brush_exit_tex(Sculpt *sd)
ntreeTexEndExecTree(mtex->tex->nodetree->execdata, 1);
}
static void sculpt_stroke_done(bContext *C, struct PaintStroke *UNUSED(stroke))
static void sculpt_stroke_done(const bContext *C, struct PaintStroke *UNUSED(stroke))
{
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
@@ -3592,7 +3592,7 @@ static int sculpt_brush_stroke_cancel(bContext *C, wmOperator *op)
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
if (ss->cache) {
paint_mesh_restore_co(sd, ss);
paint_mesh_restore_co(ss);
}
paint_stroke_cancel(C, op);