[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53994] trunk/blender/source/blender/ editors: style cleanup

Campbell Barton ideasman42 at gmail.com
Tue Jan 22 14:35:05 CET 2013


Revision: 53994
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53994
Author:   campbellbarton
Date:     2013-01-22 13:35:02 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-22 12:36:06 UTC (rev 53993)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-22 13:35:02 UTC (rev 53994)
@@ -528,7 +528,7 @@
 	
 	if (iimg->datatoc_rect) {
 		ImBuf *bbuf = IMB_ibImageFromMemory(iimg->datatoc_rect,
-											iimg->datatoc_size, IB_rect, NULL, "<matcap icon>");
+		                                    iimg->datatoc_size, IB_rect, NULL, "<matcap icon>");
 		/* w and h were set on initialize */
 		if (bbuf->x != iimg->h && bbuf->y != iimg->w)
 			IMB_scalefastImBuf(bbuf, iimg->w, iimg->h);
@@ -542,16 +542,16 @@
 static void init_matcap_icons(void)
 {
 	/* dynamic allocation now, tucking datatoc pointers in DrawInfo */
-#define INIT_MATCAP_ICON(icon_id, name)                                         \
-	{	\
-		unsigned char *rect = (unsigned char *)datatoc_ ##name## _jpg;			\
-		int size = datatoc_ ##name## _jpg_size;									\
-		DrawInfo *di;															\
-		\
-		di = def_internal_icon(NULL, icon_id, 0, 0, 128, ICON_TYPE_BUFFER);		\
-		di->data.buffer.image->datatoc_rect = rect;								\
-		di->data.buffer.image->datatoc_size = size;								\
-	}
+#define INIT_MATCAP_ICON(icon_id, name)                                       \
+	{                                                                         \
+		unsigned char *rect = (unsigned char *)datatoc_ ##name## _jpg;        \
+		int size = datatoc_ ##name## _jpg_size;                               \
+		DrawInfo *di;                                                         \
+		                                                                      \
+		di = def_internal_icon(NULL, icon_id, 0, 0, 128, ICON_TYPE_BUFFER);   \
+		di->data.buffer.image->datatoc_rect = rect;                           \
+		di->data.buffer.image->datatoc_size = size;                           \
+	} (void)0
 
 	INIT_MATCAP_ICON(ICON_MATCAP_01, mc01);
 	INIT_MATCAP_ICON(ICON_MATCAP_02, mc02);

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-01-22 12:36:06 UTC (rev 53993)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-01-22 13:35:02 UTC (rev 53994)
@@ -169,21 +169,26 @@
 }
 
 /* this condition has been made more complex since editmode can draw textures */
-static int check_object_draw_texture(Scene *scene, View3D *v3d, int drawtype)
+static bool check_object_draw_texture(Scene *scene, View3D *v3d, int drawtype)
 {
 	/* texture and material draw modes */
-	if (ELEM(v3d->drawtype, OB_TEXTURE, OB_MATERIAL) && drawtype > OB_SOLID)
-		return TRUE;
+	if (ELEM(v3d->drawtype, OB_TEXTURE, OB_MATERIAL) && drawtype > OB_SOLID) {
+		return true;
+	}
 
 	/* textured solid */
-	if (v3d->drawtype == OB_SOLID && (v3d->flag2 & V3D_SOLID_TEX)
-		&& !BKE_scene_use_new_shading_nodes(scene))
-			return TRUE;
+	if ((v3d->drawtype == OB_SOLID) &&
+	    (v3d->flag2 & V3D_SOLID_TEX) &&
+	    (BKE_scene_use_new_shading_nodes(scene) == false))
+	{
+		return true;
+	}
 	
-	if (v3d->flag2 & V3D_SHOW_SOLID_MATCAP)
-		return 1;
+	if (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) {
+		return true;
+	}
 	
-	return FALSE;
+	return false;
 }
 
 static int check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)




More information about the Bf-blender-cvs mailing list