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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-24 03:06:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-24 03:06:18 +0300
commit79f67acccb36fd67f534b75f1d0f7e0799080c24 (patch)
treeeedea1b1ab9ef35fa6353c8b2a72cf1a291358ac /source/blender/draw/engines/workbench/workbench_forward.c
parent106551b9ad1f12937c976ea7d38d00ec0df40abc (diff)
Cleanup: redundant NULL initialization
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_forward.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_forward.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index 1933e184a1f..45f1c632a05 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -97,8 +97,6 @@ static char *workbench_build_forward_vert(bool is_hair)
static char *workbench_build_forward_transparent_accum_frag(void)
{
- char *str = NULL;
-
DynStr *ds = BLI_dynstr_new();
BLI_dynstr_append(ds, datatoc_workbench_data_lib_glsl);
@@ -106,15 +104,13 @@ static char *workbench_build_forward_transparent_accum_frag(void)
BLI_dynstr_append(ds, datatoc_workbench_world_light_lib_glsl);
BLI_dynstr_append(ds, datatoc_workbench_forward_transparent_accum_frag_glsl);
- str = BLI_dynstr_get_cstring(ds);
+ char *str = BLI_dynstr_get_cstring(ds);
BLI_dynstr_free(ds);
return str;
}
static char *workbench_build_forward_composite_frag(void)
{
- char *str = NULL;
-
DynStr *ds = BLI_dynstr_new();
BLI_dynstr_append(ds, datatoc_workbench_data_lib_glsl);
@@ -124,7 +120,7 @@ static char *workbench_build_forward_composite_frag(void)
BLI_dynstr_append(ds, datatoc_workbench_curvature_lib_glsl);
BLI_dynstr_append(ds, datatoc_workbench_forward_composite_frag_glsl);
- str = BLI_dynstr_get_cstring(ds);
+ char *str = BLI_dynstr_get_cstring(ds);
BLI_dynstr_free(ds);
return str;
}