[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46239] trunk/blender/source/blender/ editors/sculpt_paint: code cleanup: minor changes to get trunk compiling with strict warnings.

Campbell Barton ideasman42 at gmail.com
Thu May 3 21:47:16 CEST 2012


Revision: 46239
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46239
Author:   campbellbarton
Date:     2012-05-03 19:47:16 +0000 (Thu, 03 May 2012)
Log Message:
-----------
code cleanup: minor changes to get trunk compiling with strict warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h	2012-05-03 19:28:41 UTC (rev 46238)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h	2012-05-03 19:47:16 UTC (rev 46239)
@@ -53,7 +53,7 @@
 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,

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2012-05-03 19:28:41 UTC (rev 46238)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2012-05-03 19:47:16 UTC (rev 46239)
@@ -267,7 +267,7 @@
 
 /*** 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 @@
 	     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 @@
 		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 @@
 	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);




More information about the Bf-blender-cvs mailing list