[Bf-blender-cvs] [20da935] master: Code cleanup: unused/warnings

Campbell Barton noreply at git.blender.org
Mon Feb 17 01:41:58 CET 2014


Commit: 20da9353b88ee544c41ada47a2ab76099e78736c
Author: Campbell Barton
Date:   Mon Feb 17 11:12:39 2014 +1100
https://developer.blender.org/rB20da9353b88ee544c41ada47a2ab76099e78736c

Code cleanup: unused/warnings

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

M	source/blender/blenfont/intern/blf.c
M	source/blender/editors/space_image/image_buttons.c
M	source/blender/imbuf/intern/util.c

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

diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 54f94ad..e086ca4 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -64,7 +64,7 @@
 #define BLF_MAX_FONT 16
 
 /* Font array. */
-static FontBLF *global_font[BLF_MAX_FONT] = {0};
+static FontBLF *global_font[BLF_MAX_FONT] = {NULL};
 
 /* Default size and dpi, for BLF_draw_default. */
 static int global_font_default = -1;
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index aaa3aa4..6b0f4a0 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -330,7 +330,7 @@ static void ui_imageuser_layer_menu(bContext *UNUSED(C), uiLayout *layout, void
 	RenderResult *rr = rnd_data[0];
 	ImageUser *iuser = rnd_data[1];
 	RenderLayer *rl;
-	RenderLayer rl_fake = {0};
+	RenderLayer rl_fake = {NULL};
 	const char *fake_name;
 	int nr;
 
@@ -382,7 +382,7 @@ static void ui_imageuser_pass_menu(bContext *UNUSED(C), uiLayout *layout, void *
 	ImageUser *iuser = ptrpair[1];
 	/* rl==NULL means composite result */
 	RenderLayer *rl = ptrpair[2];
-	RenderPass rpass_fake = {0};
+	RenderPass rpass_fake = {NULL};
 	RenderPass *rpass;
 	const char *fake_name;
 	int nr;
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 12dfcc3..7efd022 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -119,6 +119,7 @@ const char *imb_ext_image_qt[] = {
 	NULL
 };
 
+#if 0  /* UNUSED */
 const char *imb_ext_movie_qt[] = {
 	".avi",   
 	".flc",   
@@ -129,6 +130,7 @@ const char *imb_ext_movie_qt[] = {
 	".mv",
 	NULL
 };
+#endif
 
 const char *imb_ext_movie[] = {
 	".avi",




More information about the Bf-blender-cvs mailing list