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

Campbell Barton ideasman42 at gmail.com
Wed Jan 2 02:49:08 CET 2013


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

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_pbvh.h
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/blenlib/intern/math_geom.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
    trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h	2013-01-02 01:49:07 UTC (rev 53499)
@@ -128,7 +128,7 @@
 	PBVH_Collapse = 2,
 } PBVHTopologyUpdateMode;
 int BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode,
-								   const float center[3], float radius);
+                                   const float center[3], float radius);
 
 /* Node Access */
 

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -268,8 +268,8 @@
 		cddm->pbvh_draw = TRUE;
 
 		BKE_pbvh_build_bmesh(cddm->pbvh, ob->sculpt->bm,
-							 ob->sculpt->bm_smooth_shading,
-							 ob->sculpt->bm_log);
+		                     ob->sculpt->bm_smooth_shading,
+		                     ob->sculpt->bm_log);
 	}
 		
 
@@ -550,7 +550,7 @@
 			float (*face_nors)[3] = CustomData_get_layer(&dm->faceData, CD_NORMAL);
 
 			BKE_pbvh_draw(cddm->pbvh, partial_redraw_planes, face_nors,
-						  setMaterial, FALSE);
+			              setMaterial, FALSE);
 			glShadeModel(GL_FLAT);
 		}
 

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -276,7 +276,7 @@
 				BMFace *efa;
 				BM_ITER_MESH (efa, &iter, ss->bm, BM_FACES_OF_MESH) {
 					BM_elem_flag_set(efa, BM_ELEM_SMOOTH,
-									 ss->bm_smooth_shading);
+					                 ss->bm_smooth_shading);
 				}
 				if (reorder)
 					BM_log_mesh_elems_reorder(ss->bm, ss->bm_log);
@@ -300,7 +300,7 @@
 		if (ss->pbvh)
 			BKE_pbvh_free(ss->pbvh);
 		if (ss->bm_log)
- 			BM_log_free(ss->bm_log);
+			BM_log_free(ss->bm_log);
 
 		if (dm && dm->getPBVH)
 			dm->getPBVH(NULL, dm);  /* signal to clear */

Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -301,7 +301,7 @@
  * 
  * Set 'r' to the point in triangle (a, b, c) closest to point 'p' */
 void closest_on_tri_to_point_v3(float r[3], const float p[3],
-					   const float a[3], const float b[3], const float c[3])
+                                const float a[3], const float b[3], const float c[3])
 {
 	float ab[3], ac[3], ap[3], d1, d2;
 	float bp[3], d3, d4, vc, cp[3], d5, d6, vb, va;

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -5747,6 +5747,6 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	ot->prop = RNA_def_enum(ot->srna, "direction", symmetrize_direction_items,
-							BMO_SYMMETRIZE_NEGATIVE_X,
-							"Direction", "Which sides to copy from and to");
+	                        BMO_SYMMETRIZE_NEGATIVE_X,
+	                        "Direction", "Which sides to copy from and to");
 }

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/sculpt_paint/paint_2D.c
+/** \file blender/editors/sculpt_paint/paint_image_2d.c
  *  \ingroup bke
  */
 //#include <math.h>

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -545,8 +545,8 @@
 			edgecos = dot_v2v2(normal, state->normals + index_tmp1 * 2);
 			edgesin = cross_v2v2(normal, state->normals + index_tmp1 * 2);
 			rotation += (edgesin > 0.0f) ?
-				+acosf(max_ff(-1.0f, min_ff(1.0f, edgecos))) :
-	            -acosf(max_ff(-1.0f, min_ff(1.0f, edgecos)));
+			    +acosf(max_ff(-1.0f, min_ff(1.0f, edgecos))) :
+			    -acosf(max_ff(-1.0f, min_ff(1.0f, edgecos)));
 		}
 	}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-01-02 01:36:36 UTC (rev 53498)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-01-02 01:49:07 UTC (rev 53499)
@@ -3918,7 +3918,7 @@
 	RNA_def_property_ui_text(prop, "Samples", "Number of samples used for ambient occlusion baking from multires");
 	RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
 
-	prop= RNA_def_property(srna, "use_bake_to_vertex_color", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_bake_to_vertex_color", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_VCOL);
 	RNA_def_property_ui_text(prop, "Bake to Vertex Colour",
 	                         "Bake to vertex colors instead of to a UV-mapped image");




More information about the Bf-blender-cvs mailing list