[Bf-blender-cvs] [88d8cb7] master: Cleanup

Campbell Barton noreply at git.blender.org
Fri Sep 26 16:58:06 CEST 2014


Commit: 88d8cb73af6455502227838eed2ebb9bd50a04b4
Author: Campbell Barton
Date:   Sat Sep 27 00:57:54 2014 +1000
Branches: master
https://developer.blender.org/rB88d8cb73af6455502227838eed2ebb9bd50a04b4

Cleanup

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

M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/editors/armature/armature_select.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 3aba16d..399bea1 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -3088,7 +3088,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int
 	MEM_freeN(oldv);
 	MEM_freeN(olde);
 	MEM_freeN(oldl);
-	MEM_freeN(oldp);;
+	MEM_freeN(oldp);
 
 	BLI_edgehash_free(ehash, NULL);
 
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index d85a730..e61772c 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -142,8 +142,7 @@ void *get_bone_from_selectbuffer(Scene *scene, Base *base, unsigned int *buffer,
 								minunsel = buffer[4 * i + 1];
 							}
 						}
-						else 
-						{
+						else {
 							if (!firstunSel) firstunSel = data;
 							if (takeNext) return data;
 						}
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 2f0f6d5..d155918 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -302,8 +302,8 @@ bool draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const char dt)
 	if (BKE_scene_use_new_shading_nodes(scene))
 		return false;
 	
-	return ((scene->gm.matmode == GAME_MAT_GLSL && v3d->drawtype == OB_TEXTURE) || 
-			(v3d->drawtype == OB_MATERIAL)) && (dt > OB_SOLID);
+	return ((scene->gm.matmode == GAME_MAT_GLSL && v3d->drawtype == OB_TEXTURE) ||
+	        (v3d->drawtype == OB_MATERIAL)) && (dt > OB_SOLID);
 }
 
 static bool check_alpha_pass(Base *base)
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 2629d9f..479a881 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2068,14 +2068,14 @@ static void draw_dupli_objects_color(
 				 * so for now it should be ok to - campbell */
 				
 				if ( /* if this is the last no need  to make a displist */
-					 (dob_next == NULL || dob_next->ob != dob->ob) ||
-					 /* lamp drawing messes with matrices, could be handled smarter... but this works */
-					 (dob->ob->type == OB_LAMP) ||
-					 (dob->type == OB_DUPLIGROUP && dob->animated) ||
-					 !bb_tmp ||
-					 draw_glsl_material(scene, dob->ob, v3d, dt) ||
-					 check_object_draw_texture(scene, v3d, dt) ||
-					 (base->object == OBACT && v3d->flag2 & V3D_SOLID_MATCAP))
+				     (dob_next == NULL || dob_next->ob != dob->ob) ||
+				     /* lamp drawing messes with matrices, could be handled smarter... but this works */
+				     (dob->ob->type == OB_LAMP) ||
+				     (dob->type == OB_DUPLIGROUP && dob->animated) ||
+				     !bb_tmp ||
+				     draw_glsl_material(scene, dob->ob, v3d, dt) ||
+				     check_object_draw_texture(scene, v3d, dt) ||
+				     (base->object == OBACT && v3d->flag2 & V3D_SOLID_MATCAP))
 				{
 					// printf("draw_dupli_objects_color: skipping displist for %s\n", dob->ob->id.name + 2);
 					use_displist = false;
@@ -2524,8 +2524,10 @@ CustomDataMask ED_view3d_datamask(Scene *scene, View3D *v3d)
 		}
 		else {
 			if ((scene->gm.matmode == GAME_MAT_GLSL && v3d->drawtype == OB_TEXTURE) || 
-				(v3d->drawtype == OB_MATERIAL))
+			    (v3d->drawtype == OB_MATERIAL))
+			{
 				mask |= CD_MASK_ORCO;
+			}
 		}
 	}




More information about the Bf-blender-cvs mailing list