diff options
| author | Matt Ebb <matt@mke3.net> | 2009-12-10 04:30:47 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-12-10 04:30:47 +0300 |
| commit | 985c24b0f10da0de347965de0572fb6b715d8f55 (patch) | |
| tree | bd83fcd65e6611fb3fbeb94b400a55186c0b6717 /source/blender/editors/render/render_shading.c | |
| parent | 653593b5748eb7ca78c74336bca1166ade0bbc75 (diff) | |
Fix for 'Copy materials to selected' button freezing when using linked geometry
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 59b220dec63..4be35a4a2c4 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -442,7 +442,9 @@ static int material_slot_copy_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) { if(ob != ob_iter && give_matarar(ob_iter)) { - assign_matarar(ob_iter, matar, ob->totcol); + if (ob->data != ob_iter->data) + assign_matarar(ob_iter, matar, ob->totcol); + if(ob_iter->totcol==ob->totcol) { ob_iter->actcol= ob->actcol; WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob_iter); |