[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46124] trunk/blender/source: style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/ CodeStyle#Braces_with_Macros
Campbell Barton
ideasman42 at gmail.com
Mon Apr 30 18:22:40 CEST 2012
Revision: 46124
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46124
Author: campbellbarton
Date: 2012-04-30 16:22:40 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/poseUtils.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_group.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_logic/logic_buttons.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/tools/uncrustify.cfg
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -1906,7 +1906,8 @@
AnimData *adt= BKE_id_add_animdata(id);
- SEQ_BEGIN (ed, seq) {
+ SEQ_BEGIN (ed, seq)
+ {
IpoCurve *icu = (seq->ipo) ? seq->ipo->curve.first : NULL;
short adrcode = SEQ_FAC1;
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -626,7 +626,8 @@
#endif
if (sce->ed) {
Sequence *seq;
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq)
+ {
if (seq->scene_camera == ob) {
seq->scene_camera = NULL;
}
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -259,7 +259,8 @@
if (ed == NULL)
return;
- SEQ_BEGIN (ed, seq) {
+ SEQ_BEGIN (ed, seq)
+ {
seq_free_sequence(scene, seq);
}
SEQ_END
Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -510,7 +510,8 @@
if (scene->ed) {
Sequence *seq;
- SEQ_BEGIN (scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq)
+ {
if (SEQ_HAS_PATH(seq)) {
if (ELEM(seq->type, SEQ_MOVIE, SEQ_SOUND)) {
rewrite_path_fixed_dirfile(seq->strip->dir, seq->strip->stripdata->name,
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -4842,7 +4842,8 @@
}
}
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq)
+ {
if (seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
seq->scene_sound = NULL;
if (seq->scene) {
@@ -4973,7 +4974,8 @@
/* recursive link sequences, lb will be correctly initialized */
link_recurs_seq(fd, &ed->seqbase);
- SEQ_BEGIN (ed, seq) {
+ SEQ_BEGIN (ed, seq)
+ {
seq->seq1= newdataadr(fd, seq->seq1);
seq->seq2= newdataadr(fd, seq->seq2);
seq->seq3= newdataadr(fd, seq->seq3);
@@ -9012,7 +9014,8 @@
while (sce) {
ed= sce->ed;
if (ed) {
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq)
+ {
if (seq->type==SEQ_IMAGE || seq->type==SEQ_MOVIE)
seq->flag |= SEQ_MAKE_PREMUL;
}
@@ -10427,7 +10430,8 @@
Sequence *seq;
for (sce=main->scene.first; sce; sce=sce->id.next) {
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq)
+ {
if (seq->blend_mode == 0)
seq->blend_opacity = 100.0f;
}
@@ -10780,7 +10784,8 @@
while (sce) {
ed= sce->ed;
if (ed) {
- SEQP_BEGIN (ed, seq) {
+ SEQP_BEGIN (ed, seq)
+ {
if (seq->strip && seq->strip->proxy) {
seq->strip->proxy->quality =90;
}
@@ -10849,7 +10854,8 @@
for (scene = main->scene.first; scene; scene = scene->id.next) {
if (scene->ed && scene->ed->seqbasep) {
- SEQ_BEGIN (scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq)
+ {
if (seq->type == SEQ_HD_SOUND) {
char str[FILE_MAX];
BLI_join_dirfile(str, sizeof(str), seq->strip->dir, seq->strip->stripdata->name);
@@ -11819,7 +11825,8 @@
if ((sce->r.ffcodecdata.flags & FFMPEG_MULTIPLEX_AUDIO) == 0)
sce->r.ffcodecdata.audio_codec = 0x0; // CODEC_ID_NONE
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq)
+ {
seq->volume = 1.0f;
}
SEQ_END
@@ -12088,7 +12095,8 @@
for (scene= main->scene.first; scene; scene=scene->id.next) {
if (scene) {
Sequence *seq;
- SEQ_BEGIN (scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq)
+ {
if (seq->sat==0.0f) {
seq->sat= 1.0f;
}
@@ -12563,7 +12571,8 @@
for (scene=main->scene.first; scene; scene=scene->id.next) {
scene->r.ffcodecdata.audio_channels = 2;
scene->audio.volume = 1.0f;
- SEQ_BEGIN (scene->ed, seq) {
+ SEQ_BEGIN (scene->ed, seq)
+ {
seq->pitch = 1.0f;
}
SEQ_END
@@ -14293,7 +14302,8 @@
if (sce->ed) {
Sequence *seq;
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN (sce->ed, seq)
+ {
if (seq->scene) expand_doit(fd, mainvar, seq->scene);
if (seq->scene_camera) expand_doit(fd, mainvar, seq->scene_camera);
if (seq->sound) expand_doit(fd, mainvar, seq->sound);
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -2108,13 +2108,15 @@
/* reset write flags too */
- SEQ_BEGIN (ed, seq) {
+ SEQ_BEGIN (ed, seq)
+ {
if (seq->strip) seq->strip->done= 0;
writestruct(wd, DATA, "Sequence", 1, seq);
}
SEQ_END
- SEQ_BEGIN (ed, seq) {
+ SEQ_BEGIN (ed, seq)
+ {
if (seq->strip && seq->strip->done==0) {
/* write strip with 'done' at 0 because readfile */
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -1353,7 +1353,8 @@
float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
// XXX more comprehensive tests will be needed
- CTX_DATA_BEGIN (C, Object*, ob, selected_objects) {
+ CTX_DATA_BEGIN (C, Object*, ob, selected_objects)
+ {
ID *id= (ID *)ob;
FCurve *fcu, *fcn;
short success= 0;
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2012-04-30 16:19:20 UTC (rev 46123)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2012-04-30 16:22:40 UTC (rev 46124)
@@ -756,7 +756,8 @@
*
* TODO, loop over children before parents if multiple bones
* at once are to be predictable*/
- CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones) {
+ CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+ {
float delta_mat[4][4];
/* chan_mat already contains the delta transform from rest pose to pose-mode pose
@@ -922,7 +923,8 @@
pose= ob->pose;
ob->mode &= ~OB_MODE_POSE;
- CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases) {
+ CTX_DATA_BEGIN (C, Base*, base, selected_editable_bases)
+ {
if ((base->object->type==OB_ARMATURE) && (base->object!=ob)) {
bArmature *curarm= base->object->data;
@@ -1193,7 +1195,8 @@
/* 1) only edit-base selected */
// TODO: use context iterators for this?
- CTX_DATA_BEGIN (C, Base *, base, visible_bases) {
+ CTX_DATA_BEGIN (C, Base *, base, visible_bases)
+ {
if (base->object==obedit) base->flag |= 1;
else base->flag &= ~1;
}
@@ -2816,7 +2819,8 @@
return OPERATOR_CANCELLED;
/* loop over all bones, and only consider if visible */
- CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+ {
if (!(ebone->flag & BONE_CONNECTED) && (ebone->flag & BONE_ROOTSEL))
fill_add_joint(ebone, 0, &points);
if (ebone->flag & BONE_TIPSEL)
@@ -3529,7 +3533,8 @@
/* loop over all editable bones */
// XXX the old code did this in reverse order though!
- CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+ {
for (i=numcuts+1; i>1; i--) {
/* compute cut ratio first */
float cutratio= 1.0f / (float)i;
@@ -3817,7 +3822,8 @@
*/
/* parent selected bones to the active one */
- CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+ {
if (ELEM(ebone, actbone, actmirb) == 0) {
if (ebone->flag & BONE_SELECTED)
bone_connect_to_new_parent(arm->edbo, ebone, actbone, val);
@@ -3842,7 +3848,8 @@
uiLayout *layout= uiPupMenuLayout(pup);
int allchildbones = 0;
- CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+ {
if (ebone != actbone) {
if (ebone->parent != actbone) allchildbones= 1;
}
@@ -3901,7 +3908,8 @@
bArmature *arm= (bArmature *)ob->data;
int val = RNA_enum_get(op->ptr, "type");
- CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+ {
editbone_clear_parent(ebone, val);
}
CTX_DATA_END;
@@ -3937,7 +3945,8 @@
static int armature_select_inverse_exec(bContext *C, wmOperator *UNUSED(op))
{
/* Set the flags */
- CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+ {
/* ignore bone if selection can't change */
if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
/* select bone */
@@ -3979,7 +3988,8 @@
}
/* Set the flags */
- CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+ {
/* ignore bone if selection can't change */
if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
switch (action) {
@@ -4398,7 +4408,8 @@
*/
/* align selected bones to the active one */
- CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones) {
+ CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list