[Bf-blender-cvs] [d9dd290] master: Style cleanup
Campbell Barton
noreply at git.blender.org
Mon May 19 16:15:51 CEST 2014
Commit: d9dd29054f0154b629cdaea04862602446f1575c
Author: Campbell Barton
Date: Tue May 20 00:11:16 2014 +1000
https://developer.blender.org/rBd9dd29054f0154b629cdaea04862602446f1575c
Style cleanup
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_lamp.c
M source/blender/makesrna/intern/rna_linestyle.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_world.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 5316c5d..3ea535e 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -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);
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 0f7c3e2..1f3002e 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -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);
}
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 2193a5d..abbb8dd 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -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);
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index 38f46c8..be27505 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -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);
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index c4e4d59..e9861b9 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -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)
diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c
index 4e7d244..31f5f53 100644
--- a/source/blender/makesrna/intern/rna_linestyle.c
+++ b/source/blender/makesrna/intern/rna_linestyle.c
@@ -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");
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 71b2926..3658259 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -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;
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index a1dde4c..674ea92 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -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);
diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c
index c921403..f63350e 100644
--- a/source/blender/makesrna/intern/rna_world.c
+++ b/source/blender/makesrna/intern/rna_world.c
@@ -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);
More information about the Bf-blender-cvs
mailing list