style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Jan 2013 01:49:07 +0000 (01:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Jan 2013 01:49:07 +0000 (01:49 +0000)
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/math_geom.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/makesrna/intern/rna_scene.c

index 63a6100660636ce9dd776732b96591cc3e9a5b38..709db7e4570e90a1a60dcb807e069b2a40c61781 100644 (file)
@@ -128,7 +128,7 @@ typedef enum {
        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 */
 
index 5f747827ba79df5a2b6bd8102edcf0b2a9754fcc..164faba1b1d7fecaf98048db3fba2d8abead6d56 100644 (file)
@@ -268,8 +268,8 @@ static PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
                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 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm,
                        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);
                }
 
index 5914cbfc52202fd19706789d8e86e552f3a9ea9b..976818fe2dfff81f420adf55081001360337394d 100644 (file)
@@ -276,7 +276,7 @@ void sculptsession_bm_to_me(struct Object *ob, int reorder)
                                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 @@ void free_sculptsession(Object *ob)
                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 */
index eec59e47ea62a708d863bf7f803a15f651aa798f..3527af365ec1cab3367f992396abf50a465e55b2 100644 (file)
@@ -301,7 +301,7 @@ float dist_to_line_segment_v3(const float v1[3], const float v2[3], const float
  * 
  * 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;
index 81f18b6a551196eb6cdc91619dbc248edc8d6ff8..b25b3cc683c369dba47cc7d433a2ce82e54100ec 100644 (file)
@@ -5747,6 +5747,6 @@ void MESH_OT_symmetrize(struct wmOperatorType *ot)
        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");
 }
index 80e189a08e12858a069dcf771357a2d2b2eb5931..2e5ab757be39d0b424404649432a3d4c3a4b01c9 100644 (file)
@@ -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>
index dc9f5fbf97cb9b0cc625c62208d0e999016d01e3..8c3eaa1192fe78f404a5a9e6e99ec62f25b13364 100644 (file)
@@ -545,8 +545,8 @@ static void stitch_island_calculate_vert_rotation(UvElement *element, StitchStat
                        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)));
                }
        }
 
index 5731b6379c9e60b9162cb378751555952939d849..7507e90525e0dc9fdd6082cecefd0cca35bbf794 100644 (file)
@@ -3918,7 +3918,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        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");