diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-06 01:54:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-06 01:54:05 +0400 |
commit | ae4ed68dfef8a97056b41393915ca853804dd8fe (patch) | |
tree | 7f539c65cca46c00629900f559d11dd826ee8a92 /source/blender/editors | |
parent | 98bf3959b484216000c48d12666ce6120ca15f99 (diff) |
Code cleanup: style
Diffstat (limited to 'source/blender/editors')
4 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 7da8aee8d6c..c92ab04ab84 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -841,7 +841,7 @@ static void rearrange_animchannel_add_to_islands(ListBase *islands, ListBase *sr (is_sel == 0) || /* 4) hidden status changes */ ((island->flag & REORDER_ISLAND_HIDDEN) != is_hidden) - ) + ) { /* create a new island now */ island = MEM_callocN(sizeof(tReorderChannelIsland), "tReorderChannelIsland"); diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 3f8393e6117..9075ca26e40 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -299,7 +299,7 @@ static bool bake_object_check(Object *ob, ReportList *reports) BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is not a mesh", ob->id.name + 2); return false; } - else { + else { Mesh *me = (Mesh *)ob->data; const int pidx = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY); @@ -774,11 +774,12 @@ static int bake( /* make sure low poly renders */ ob_low->restrictflag &= ~OB_RESTRICT_RENDER; - if (RE_bake_has_engine(re)) + if (RE_bake_has_engine(re)) { ok = RE_bake_engine(re, ob_low, pixel_array_low, num_pixels, depth, pass_type, result); + } else { - BKE_report(reports, RPT_ERROR, "Current render engine does not support baking"); - goto cleanup; + BKE_report(reports, RPT_ERROR, "Current render engine does not support baking"); + goto cleanup; } } diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 79ab300fa7f..b91bc793f85 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -450,7 +450,8 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op)) tex->id.us--; if (ptr.id.data && GS(((ID *)ptr.id.data)->name) == ID_MA && - RNA_property_pointer_get(&ptr, prop).id.data == NULL) { + RNA_property_pointer_get(&ptr, prop).id.data == NULL) + { /* In case we are assigning new texture to a material, and active slot was empty, reset 'use' flag. */ Material *ma = (Material *)ptr.id.data; ma->septex &= ~(1 << ma->texact); diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 8be56fd9022..7c2f71c0153 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -430,7 +430,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage) for (a = me->totpoly; a != 0; a--, mpoly++) { const int mat_nr = mpoly->mat_nr; if ((mat_nr >= ob->totcol) || - (BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0) + (BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0) { continue; } |