diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-12 02:12:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-12 02:12:32 +0400 |
commit | b96c6220157807cbfa3568031d5ab688280fe1d6 (patch) | |
tree | b357c12ac0d629577a7711769dcec4f410293ee4 /source/blender/editors | |
parent | c567cf3fab5b962a4166ef44f45c80941021b60d (diff) |
style cleanup
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/ED_object.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_select.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index d876d311d30..a08db8072f2 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -103,7 +103,7 @@ void ED_base_object_activate(struct bContext *C, struct Base *base); void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Base *base); -/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */ +/* single object duplicate, if (dupflag == 0), fully linked, else it uses the flags given */ struct Base *ED_object_add_duplicate(struct Main *bmain, struct Scene *scene, struct Base *base, int dupflag); void ED_object_parent(struct Object *ob, struct Object *parent, int type, const char *substr); diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 76445bc5085..90f8bb52826 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -2094,7 +2094,7 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data } /* this makes adjacent blocks auto open from now on */ - //if (but->block->auto_open==0) but->block->auto_open= 1; + //if (but->block->auto_open ==0 ) but->block->auto_open = 1; } static void ui_blockopen_end(bContext *C, uiBut *but, uiHandleButtonData *data) @@ -3395,7 +3395,7 @@ static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmND /* Convert current color on hue/sat disc to circular coordinates phi, r */ phi = fmodf(hsv[0] + 0.25f, 1.0f) * -2.0f * (float)M_PI; r = hsv[1]; - /* sqr= r>0.f?sqrtf(r):1; */ /* UNUSED */ + /* sqr = r > 0.0f ? sqrtf(r) : 1; */ /* UNUSED */ /* Convert to 2d vectors */ v[0] = r * cosf(phi); diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 10a76825984..621d06a7bd8 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -706,7 +706,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF // ask user if thats what he/she wants... selection = pupmenu(dispmsg); - if (selection<1) return 0; // 0 from menu, or -1 aborted + if (selection < 1) return 0; // 0 from menu, or -1 aborted BLI_strncpy(targetDir, newSurfdataPath, sizeof(targetDir)); strncpy(domainSettings->surfdataPath, newSurfdataPath, FILE_MAXDIR); BLI_path_abs(targetDir, G.main->name); // fixed #frame-no diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 1f9a60898f6..b2a9584b243 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -580,7 +580,7 @@ static int image_view_all_exec(bContext *C, wmOperator *UNUSED(op)) w = width * aspx; h = height * aspy; - /* check if the image will fit in the image with zoom==1 */ + /* check if the image will fit in the image with (zoom == 1) */ width = ar->winrct.xmax - ar->winrct.xmin + 1; height = ar->winrct.ymax - ar->winrct.ymin + 1; diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 7b90d66c11c..2f4e7648a5f 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -377,7 +377,7 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i } } } - else { /* extend==0 */ + else { /* extend == 0 */ /* find the closest visible node */ node = node_under_mouse_select(snode->edittree, mx, my); |