[Bf-blender-cvs] [3824e0f1] master: Cleanup: style

[Campbell Barton]

Commit: 3824e0f1243798fc580f18c7948a5fc473baa58c
Author: Campbell Barton
Date:   Sat Mar 14 12:10:09 2015 +1100
Branches: master
https://developer.blender.org/rB3824e0f1243798fc580f18c7948a5fc473baa58c

Cleanup: style

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

M	source/blender/editors/space_graph/graph_draw.c
M	source/blender/imbuf/intern/bmp.c
M	source/blender/makesrna/intern/rna_image_api.c
M	source/blender/makesrna/intern/rna_lamp.c
M	source/blender/makesrna/intern/rna_space_api.c
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index 2d8a0a3..a5c04ce 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -908,7 +908,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 			glPointSize(7.0);
 			
 			glBegin(GL_POINTS);
-				glVertex2f(x, y);
+			glVertex2f(x, y);
 			glEnd();
 			
 			/* inner frame */
@@ -916,7 +916,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
 			glPointSize(3.0);
 			
 			glBegin(GL_POINTS);
-				glVertex2f(x, y);
+			glVertex2f(x, y);
 			glEnd();
 			
 			glPointSize(1.0f);
diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c
index bc5ad96..19e655a 100644
--- a/source/blender/imbuf/intern/bmp.c
+++ b/source/blender/imbuf/intern/bmp.c
@@ -143,7 +143,7 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags, char co
 		mem += BMP_FILEHEADER_SIZE;
 	}
 	else {
-		return 0;
+		return NULL;
 	}
 
 	/* for systems where an int needs to be 4 bytes aligned */
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index 5fc65ea..3574909 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -72,7 +72,7 @@ static void rna_Image_save_render(Image *image, bContext *C, ReportList *reports
 	}
 
 	if (scene) {
-		ImageUser iuser = {0};
+		ImageUser iuser = {NULL};
 		void *lock;
 
 		iuser.scene = scene;
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index d4084bd..c915acd 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -94,7 +94,7 @@ static int rna_use_shadow_get(PointerRNA *ptr)
 	Lamp *la = (Lamp *)ptr->data;
 
 	if (la->type == LA_SPOT) {
-		return (la->mode & (LA_SHAD_BUF|LA_SHAD_RAY)) != 0;
+		return (la->mode & (LA_SHAD_BUF | LA_SHAD_RAY)) != 0;
 	}
 	else {
 		return (la->mode & LA_SHAD_RAY) != 0;
diff --git a/source/blender/makesrna/intern/rna_space_api.c b/source/blender/makesrna/intern/rna_space_api.c
index 4114ee8..3cfbd79 100644
--- a/source/blender/makesrna/intern/rna_space_api.c
+++ b/source/blender/makesrna/intern/rna_space_api.c
@@ -101,7 +101,7 @@ void RNA_api_space_text(StructRNA *srna)
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	parm = RNA_def_int(func, "column", 0, INT_MIN, INT_MAX, "Column", "Column index", 0, INT_MAX);
 	RNA_def_property_flag(parm, PROP_REQUIRED);
-	parm = RNA_def_int_array(func, "result", 2, 0, -1, INT_MAX, "", "Region coordinates", -1, INT_MAX);
+	parm = RNA_def_int_array(func, "result", 2, NULL, -1, INT_MAX, "", "Region coordinates", -1, INT_MAX);
 	RNA_def_function_output(func, parm);
 }
 
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 5d0c5d4..6f9646f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4293,7 +4293,7 @@ static void radial_control_cancel(bContext *C, wmOperator *op)
 {
 	RadialControl *rc = op->customdata;
 	wmWindowManager *wm = CTX_wm_manager(C);
-    ScrArea *sa = CTX_wm_area(C);
+	ScrArea *sa = CTX_wm_area(C);
 
 	if (rc->dial) {
 		MEM_freeN(rc->dial);