diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-09 07:46:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-09 07:46:30 +0400 |
| commit | ddddb7bab173b040342ef99270ee71ae076d45e8 (patch) | |
| tree | 1d2f91c15982ff3ce1d4431d9a96b1277e50d84d /source/blender/editors/space_outliner/outliner_tools.c | |
| parent | 9e1ead1940f084c24b3751a1a52e40f40c3c4df1 (diff) | |
code cleanup: favor braces when blocks have mixed brace use.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tools.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 0a3aea3b1f9..07e22363ad5 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -190,8 +190,10 @@ static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEle World *wrld = (World *)tsep->id; mtex = wrld->mtex; } - else return; - + else { + return; + } + for (a = 0; a < MAX_MTEX; a++) { if (a == te->index && mtex[a]) { if (mtex[a]->tex) { @@ -1259,7 +1261,9 @@ static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, S WM_operator_name_call(C, "OUTLINER_OT_object_operation", WM_OP_INVOKE_REGION_WIN, NULL); } else if (idlevel) { - if (idlevel == -1 || datalevel) BKE_report(reports, RPT_WARNING, "Mixed selection"); + if (idlevel == -1 || datalevel) { + BKE_report(reports, RPT_WARNING, "Mixed selection"); + } else { if (idlevel == ID_GR) WM_operator_name_call(C, "OUTLINER_OT_group_operation", WM_OP_INVOKE_REGION_WIN, NULL); @@ -1268,7 +1272,9 @@ static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, S } } else if (datalevel) { - if (datalevel == -1) BKE_report(reports, RPT_WARNING, "Mixed selection"); + if (datalevel == -1) { + BKE_report(reports, RPT_WARNING, "Mixed selection"); + } else { if (datalevel == TSE_ANIM_DATA) WM_operator_name_call(C, "OUTLINER_OT_animdata_operation", WM_OP_INVOKE_REGION_WIN, NULL); |