Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-03-27 18:36:00 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-03-27 20:12:12 +0300
commit59b578e320313958be69400f34fe3d0dd2ae865c (patch)
tree0d973d0509a9e745c63f6a58cbd1d1bb839569ff /source
parent3d305b5a37e8d9a8b986d13cb210dce547fcc020 (diff)
Cleanup: use const char for stats arg
Diffstat (limited to 'source')
-rw-r--r--source/blender/compositor/intern/COM_ExecutionSystem.cpp2
-rw-r--r--source/blender/editors/space_node/node_edit.c2
-rw-r--r--source/blender/makesdna/DNA_node_types.h2
-rw-r--r--source/blender/render/intern/source/pipeline.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 1f8b7654786..0466fbedb0a 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 b8b8d5f53b8..27af4e7490b 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 f08b3ea9590..de1c9237a50 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 fe51696b16c..b18edd4c61e 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);