[Bf-blender-cvs] [59b578e] master: Cleanup: use const char for stats arg

Campbell Barton noreply at git.blender.org
Fri Mar 27 18:12:46 CET 2015


Commit: 59b578e320313958be69400f34fe3d0dd2ae865c
Author: Campbell Barton
Date:   Sat Mar 28 02:36:00 2015 +1100
Branches: master
https://developer.blender.org/rB59b578e320313958be69400f34fe3d0dd2ae865c

Cleanup: use const char for stats arg

===================================================================

M	source/blender/compositor/intern/COM_ExecutionSystem.cpp
M	source/blender/editors/space_node/node_edit.c
M	source/blender/makesdna/DNA_node_types.h
M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 1f8b765..0466fbe 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
@@ -76,7 +76,7 @@ ExecutionSystem::ExecutionSystem(RenderData *rd, Scene *scene, bNodeTree *editin
 	                         viewer_border->xmin < viewer_border->xmax &&
 	                         viewer_border->ymin < viewer_border->ymax;
 
-	editingtree->stats_draw(editingtree->sdh, (char*)"Compositing | Determining resolution");
+	editingtree->stats_draw(editingtree->sdh, "Compositing | Determining resolution");
 
 	for (index = 0; index < this->m_groups.size(); index++) {
 		resolution[0] = 0;
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index b8b8d5f..27af4e7 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -162,7 +162,7 @@ static int compo_breakjob(void *cjv)
 }
 
 /* called by compo, wmJob sends notifier */
-static void compo_statsdrawjob(void *cjv, char *UNUSED(str))
+static void compo_statsdrawjob(void *cjv, const char *UNUSED(str))
 {
 	CompoJob *cj = cjv;
 	
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index f08b3ea..de1c923 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -383,7 +383,7 @@ typedef struct bNodeTree {
 	
 	/* callbacks */
 	void (*progress)(void *, float progress);
-	void (*stats_draw)(void *, char *str);
+	void (*stats_draw)(void *, const char *str);
 	int (*test_break)(void *);
 	void (*update_draw)(void *);
 	void *tbh, *prh, *sdh, *udh;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index fe51696..b18edd4 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1956,7 +1956,7 @@ static void ntree_render_scenes(Render *re)
 }
 
 /* bad call... need to think over proper method still */
-static void render_composit_stats(void *UNUSED(arg), char *str)
+static void render_composit_stats(void *UNUSED(arg), const char *str)
 {
 	R.i.infostr = str;
 	R.stats_draw(R.sdh, &R.i);




More information about the Bf-blender-cvs mailing list