diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
| commit | cdbfd1db3800cf4f0ea691f09bf05e78a82c80f9 (patch) | |
| tree | b1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1 /source/blender/editors/render/render_shading.c | |
| parent | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (diff) | |
| parent | 15eb3452ecd96e4d79d438e8c954918639dc283d (diff) | |
Merged changes in the trunk up to revision 45820.
Conflicts resolved:
source/creator/creator.c
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 1153f7023b2..89a8c7b0852 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -174,8 +174,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) BMIter iter; if (em) { - BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) - { + BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) efa->mat_nr = ob->actcol - 1; } |