diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
| commit | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (patch) | |
| tree | e42fb8ecc337a617a98e01f6c882b890ab9387e6 /source/blender/editors/render/render_shading.c | |
| parent | 00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4 (diff) | |
| parent | 95bba22af075148f9cbdb5a9b1ef41aeff1f560f (diff) | |
Merged changes in the trunk up to revision 44612.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index d7a9d96830b..7d7063b621c 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -169,7 +169,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) if(ob && ob->actcol>0) { if(ob->type == OB_MESH) { - BMEditMesh *em= ((Mesh*)ob->data)->edit_btmesh; + BMEditMesh *em = BMEdit_FromObject(ob); BMFace *efa; BMIter iter; @@ -224,13 +224,13 @@ void OBJECT_OT_material_slot_assign(wmOperatorType *ot) static int material_slot_de_select(bContext *C, int select) { - Object *ob= ED_object_context(C); + Object *ob = ED_object_context(C); if(!ob) return OPERATOR_CANCELLED; if(ob->type == OB_MESH) { - BMEditMesh *em= ((Mesh*)ob->data)->edit_btmesh; + BMEditMesh *em = BMEdit_FromObject(ob); if(em) { EDBM_deselect_by_material(em, ob->actcol-1, select); |