[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47006] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Fri May 25 11:51:54 CEST 2012
Revision: 47006
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47006
Author: campbellbarton
Date: 2012-05-25 09:51:53 +0000 (Fri, 25 May 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_text/space_text.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/util/editmode_undo.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -7508,7 +7508,7 @@
for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Smoke) {
SmokeModifierData *smd = (SmokeModifierData *)md;
- if((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
+ if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
int maxres = MAX3(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]);
smd->domain->scale = smd->domain->dx * maxres;
smd->domain->dx = 1.0f / smd->domain->scale;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -927,11 +927,11 @@
return;
BLI_strncpy(from, last_seq->strip->dir, sizeof(from));
-// XXX if (0==sbutton(from, 0, sizeof(from)-1, "From: "))
+// XXX if (0 == sbutton(from, 0, sizeof(from)-1, "From: "))
// return;
BLI_strncpy(to, from, sizeof(to));
-// XXX if (0==sbutton(to, 0, sizeof(to)-1, "To: "))
+// XXX if (0 == sbutton(to, 0, sizeof(to)-1, "To: "))
// return;
if (strcmp(to, from) == 0)
@@ -1989,7 +1989,7 @@
Scene *scene = CTX_data_scene(C);
Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
- Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks ed==NULL */
+ Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks (ed == NULL) */
if (last_seq == NULL || last_seq->type != SEQ_META)
return OPERATOR_CANCELLED;
Modified: trunk/blender/source/blender/editors/space_text/space_text.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/space_text.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_text/space_text.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -128,7 +128,7 @@
switch (wmn->category) {
case NC_TEXT:
/* check if active text was changed, no need to redraw if text isn't active
- * reference==NULL means text was unlinked, should update anyway for this
+ * (reference == NULL) means text was unlinked, should update anyway for this
* case -- no way to know was text active before unlinking or not */
if (wmn->reference && wmn->reference != st->text)
break;
Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -1696,7 +1696,7 @@
bone = pchan->bone;
if (bone) {
/* 1) bone must be visible, 2) for OpenGL select-drawing cannot have unselectable [#27194]
- * NOTE: this is the only case with NO_DEFORM==0 flag, as this is for envelope influence drawing
+ * NOTE: this is the only case with (NO_DEFORM == 0) flag, as this is for envelope influence drawing
*/
if ( (bone->flag & (BONE_HIDDEN_P | BONE_NO_DEFORM | BONE_HIDDEN_PG)) == 0 &&
((G.f & G_PICKSEL) == 0 || (bone->flag & BONE_UNSELECTABLE) == 0) )
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -3949,7 +3949,7 @@
int retval = 0;
/* backface culling */
- if(v3d->flag2 & V3D_BACKFACE_CULLING) {
+ if (v3d->flag2 & V3D_BACKFACE_CULLING) {
/* not all displists use same in/out normal direction convention */
glEnable(GL_CULL_FACE);
glCullFace((ob->type == OB_MBALL) ? GL_BACK : GL_FRONT);
@@ -6592,7 +6592,7 @@
if (v3d->zbuf == 0 && dt > OB_WIRE) dt = OB_WIRE;
dtx = 0;
- /* faceselect exception: also draw solid when dt==wire, except in editmode */
+ /* faceselect exception: also draw solid when (dt == wire), except in editmode */
if (is_obact && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
if (ob->type == OB_MESH) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -1863,7 +1863,7 @@
/* generate displist */
if (use_displist == -1) {
- /* note, since this was added, its checked dob->type==OB_DUPLIGROUP
+ /* note, since this was added, its checked (dob->type == OB_DUPLIGROUP)
* however this is very slow, it was probably needed for the NLA
* offset feature (used in group-duplicate.blend but no longer works in 2.5)
* so for now it should be ok to - campbell */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -547,7 +547,7 @@
time_currwheel = PIL_check_seconds_timer();
time_wheel = (float)(time_currwheel - fly->time_lastwheel);
fly->time_lastwheel = time_currwheel;
- /* Mouse wheel delays range from 0.5==slow to 0.01==fast */
+ /* Mouse wheel delays range from (0.5 == slow) to (0.01 == fast) */
time_wheel = 1.0f + (10.0f - (20.0f * MIN2(time_wheel, 0.5f))); /* 0-0.5 -> 0-5.0 */
if (fly->speed < 0.0f) {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -500,7 +500,7 @@
}
else {
if (cu->drawflag & CU_HIDE_HANDLES) {
- /* can only be beztindex==0 here since handles are hidden */
+ /* can only be (beztindex == 0) here since handles are hidden */
bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
}
else {
@@ -1480,15 +1480,18 @@
if (extend) {
ED_base_object_select(basact, BA_SELECT);
}
- else if(deselect) {
+ else if (deselect) {
ED_base_object_select(basact, BA_DESELECT);
}
- else if(toggle) {
+ else if (toggle) {
if (basact->flag & SELECT) {
- if (basact == oldbasact)
+ if (basact == oldbasact) {
ED_base_object_select(basact, BA_DESELECT);
+ }
}
- else ED_base_object_select(basact, BA_SELECT);
+ else {
+ ED_base_object_select(basact, BA_SELECT);
+ }
}
else {
deselectall_except(scene, basact);
@@ -1549,7 +1552,7 @@
}
else {
if (cu->drawflag & CU_HIDE_HANDLES) {
- /* can only be beztindex==0 here since handles are hidden */
+ /* can only be (beztindex == 0) here since handles are hidden */
bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
}
else {
@@ -2294,7 +2297,7 @@
}
else {
if (cu->drawflag & CU_HIDE_HANDLES) {
- /* can only be beztindex==0 here since handles are hidden */
+ /* can only be (beztindex == 0) here since handles are hidden */
bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT);
}
else {
Modified: trunk/blender/source/blender/editors/util/editmode_undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/editmode_undo.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/editors/util/editmode_undo.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -129,7 +129,7 @@
/* at first here was code to prevent an "original" key to be inserted twice
* this was giving conflicts for example when mesh changed due to keys or apply */
- /* remove all undos after (also when curundo==NULL) */
+ /* remove all undos after (also when curundo == NULL) */
while (undobase.last != curundo) {
uel = undobase.last;
uel->freedata(uel->undodata);
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -1254,7 +1254,7 @@
if (GMS.is_alpha_pass) glDepthMask(1);
if (GMS.backface_culling) {
- if(mat->game.flag)
+ if (mat->game.flag)
glEnable(GL_CULL_FACE);
else
glDisable(GL_CULL_FACE);
Modified: trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c 2012-05-25 09:42:58 UTC (rev 47005)
+++ trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c 2012-05-25 09:51:53 UTC (rev 47006)
@@ -57,47 +57,47 @@
/* Note: detecting the IK chain is duplicate code... in drawarmature.c and in transform_conversions.c */
static void initialize_posetree(struct Object *UNUSED(ob), bPoseChannel *pchan_tip)
{
- bPoseChannel *curchan, *pchan_root=NULL, *chanlist[256], **oldchan;
+ bPoseChannel *curchan, *pchan_root = NULL, *chanlist[256], **oldchan;
PoseTree *tree;
PoseTarget *target;
bConstraint *con;
bKinematicConstraint *data;
- int a, t, segcount= 0, size, newsize, *oldparent, parent;
+ int a, t, segcount = 0, size, newsize, *oldparent, parent;
/* find IK constraint, and validate it */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list