Style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 May 2014 14:11:16 +0000 (00:11 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 May 2014 14:11:16 +0000 (00:11 +1000)
source/blender/blenkernel/intern/object.c
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_linestyle.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_world.c

index 5316c5df2e5e2b9a5db822f7de92755575792595..3ea535ef97a7ce2d7fb5878a27bde39ba5a5b0b2 100644 (file)
@@ -3384,8 +3384,8 @@ int BKE_object_is_deform_modified(Scene *scene, Object *ob)
        VirtualModifierData virtualModifierData;
        int flag = 0;
 
-       if(BKE_key_from_object(ob))
-               flag |= eModifierMode_Realtime|eModifierMode_Render;
+       if (BKE_key_from_object(ob))
+               flag |= eModifierMode_Realtime | eModifierMode_Render;
 
        /* cloth */
        for (md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
index 0f7c3e2e3cf8156843cde7c23fdc797a82832bbc..1f3002e05f9f329b260e58a8fe254b88121ff995 100644 (file)
@@ -3224,7 +3224,7 @@ static void bevel_reattach_wires(BMesh *bm, BevelParams *bp, BMVert *v)
                                        dclosest = d;
                                }
                        }
-               } while((bndv = bndv->next) != bv->vmesh->boundstart);
+               } while ((bndv = bndv->next) != bv->vmesh->boundstart);
                if (vclosest)
                        BM_edge_create(bm, vclosest, votherclosest, e, BM_CREATE_NO_DOUBLE);
        }
index 2193a5d018d1308aa495555d6eb5771b6e48a3ff..abbb8dd55ce7006b146117752a51f1489ec928c2 100644 (file)
@@ -5042,12 +5042,14 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op)
                        BKE_sculpt_mask_layers_ensure(ob, mmd);
                }
 
-               if (!(fabsf(ob->size[0] - ob->size[1]) < 1e-4f && fabsf(ob->size[1] - ob->size[2]) < 1e-4f))
+               if (!(fabsf(ob->size[0] - ob->size[1]) < 1e-4f && fabsf(ob->size[1] - ob->size[2]) < 1e-4f)) {
                        BKE_report(op->reports, RPT_WARNING,
-                                          "Object has non-uniform scale, sculpting may be unpredictable");
-               else if (is_negative_m4(ob->obmat))
+                                  "Object has non-uniform scale, sculpting may be unpredictable");
+               }
+               else if (is_negative_m4(ob->obmat)) {
                        BKE_report(op->reports, RPT_WARNING,
-                                          "Object has negative scale, sculpting may be unpredictable");
+                                  "Object has negative scale, sculpting may be unpredictable");
+               }
 
                BKE_paint_init(&ts->sculpt->paint, PAINT_CURSOR_SCULPT);
 
index 38f46c88e37c88adea348314548bb7d9e2dbcf2c..be2750589571178c57203374a46611a1479e4e5e 100644 (file)
@@ -201,7 +201,7 @@ void rna_def_motionpath_common(struct StructRNA *srna);
 void rna_def_texmat_common(struct StructRNA *srna, const char *texspace_editable);
 void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna, const char *begin, const char *activeget,
                          const char *activeset, const char *activeeditable, const char *structname,
-                                                const char *structname_slots, const char *update, const char *update_index);
+                         const char *structname_slots, const char *update, const char *update_index);
 void rna_def_render_layer_common(struct StructRNA *srna, int scene);
 
 void rna_def_actionbone_group_common(struct StructRNA *srna, int update_flag, const char *update_cb);
index c4e4d5958e555ecd07f1c68d544f3a44a4a8c3e8..e9861b909567b9cb8842030976ce4ab6f84be1a0 100644 (file)
@@ -410,8 +410,8 @@ static void rna_def_lamp(BlenderRNA *brna)
        
        /* textures */
        rna_def_mtex_common(brna, srna, "rna_Lamp_mtex_begin", "rna_Lamp_active_texture_get",
-                                               "rna_Lamp_active_texture_set", NULL, "LampTextureSlot", "LampTextureSlots",
-                                               "rna_Lamp_draw_update", "rna_Lamp_draw_update");
+                           "rna_Lamp_active_texture_set", NULL, "LampTextureSlot", "LampTextureSlots",
+                           "rna_Lamp_draw_update", "rna_Lamp_draw_update");
 }
 
 static void rna_def_lamp_falloff(StructRNA *srna)
index 4e7d24469d5839fa22e06bf44ea2aa3c0199b6af..31f5f531f1bf6fd3cb7eecbf8c7ac4ab5d39b8a2 100644 (file)
@@ -1326,8 +1326,8 @@ static void rna_def_linestyle(BlenderRNA *brna)
        RNA_def_struct_ui_icon(srna, ICON_LINE_DATA);
 
        rna_def_mtex_common(brna, srna, "rna_LineStyle_mtex_begin", "rna_LineStyle_active_texture_get",
-                                               "rna_LineStyle_active_texture_set", NULL, "LineStyleTextureSlot", "LineStyleTextureSlots",
-                                               "rna_LineStyle_update", "rna_LineStyle_update");
+                           "rna_LineStyle_active_texture_set", NULL, "LineStyleTextureSlot", "LineStyleTextureSlots",
+                           "rna_LineStyle_update", "rna_LineStyle_update");
 
        prop = RNA_def_property(srna, "panel", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_bitflag_sdna(prop, NULL, "panel");
index 71b2926e75aec556672f6bf039ec48a700f27cc6..36582597113da2c5f07b3ef90bea0e04f691da18 100644 (file)
@@ -2042,7 +2042,7 @@ void RNA_def_material(BlenderRNA *brna)
        rna_def_animdata_common(srna);
        rna_def_mtex_common(brna, srna, "rna_Material_mtex_begin", "rna_Material_active_texture_get",
                            "rna_Material_active_texture_set", "rna_Material_active_texture_editable",
-                                               "MaterialTextureSlot", "MaterialTextureSlots", "rna_Material_update", "rna_Material_update");
+                           "MaterialTextureSlot", "MaterialTextureSlots", "rna_Material_update", "rna_Material_update");
 
        /* only material has this one */
        prop = RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE);
@@ -2103,8 +2103,8 @@ static void rna_def_texture_slots(BlenderRNA *brna, PropertyRNA *cprop, const ch
 }
 
 void rna_def_mtex_common(BlenderRNA *brna, StructRNA *srna, const char *begin,
-                                                const char *activeget, const char *activeset, const char *activeeditable,
-                                                const char *structname, const char *structname_slots, const char *update, const char *update_index)
+                         const char *activeget, const char *activeset, const char *activeeditable,
+                         const char *structname, const char *structname_slots, const char *update, const char *update_index)
 {
        PropertyRNA *prop;
 
index a1dde4caf9820458c14098415e0284d9071f9717..674ea92fcbe8057f783abc1904bab0ecb03d7373 100644 (file)
@@ -2072,7 +2072,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 
        rna_def_mtex_common(brna, srna, "rna_ParticleSettings_mtex_begin", "rna_ParticleSettings_active_texture_get",
                            "rna_ParticleSettings_active_texture_set", NULL, "ParticleSettingsTextureSlot",
-                                               "ParticleSettingsTextureSlots", "rna_Particle_reset", NULL);
+                           "ParticleSettingsTextureSlots", "rna_Particle_reset", NULL);
 
        /* fluid particle type can't be checked from the type value in rna as it's not shown in the menu */
        prop = RNA_def_property(srna, "is_fluid", PROP_BOOLEAN, PROP_NONE);
index c92140348bcde0b87d00a1c6711b330e19ee652c..f63350ea0ae43c3a7ff9399e909deb91f75e6947 100644 (file)
@@ -450,8 +450,8 @@ void RNA_def_world(BlenderRNA *brna)
 
        rna_def_animdata_common(srna);
        rna_def_mtex_common(brna, srna, "rna_World_mtex_begin", "rna_World_active_texture_get",
-                                               "rna_World_active_texture_set", NULL, "WorldTextureSlot", "WorldTextureSlots",
-                                               "rna_World_update", "rna_World_update");
+                           "rna_World_active_texture_set", NULL, "WorldTextureSlot", "WorldTextureSlots",
+                           "rna_World_update", "rna_World_update");
 
        /* colors */
        prop = RNA_def_property(srna, "horizon_color", PROP_FLOAT, PROP_COLOR);