diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-02 22:10:35 +0300 |
commit | a6721c60d9bc0897e3ce0dc87264fbc705284397 (patch) | |
tree | 12dd77160bcfaa4b37e85a5e8ed29496bb6c0705 /source/blender/blenkernel/intern/material.c | |
parent | 16ca4b572e07aa0f83158c187a7c64b27675d4c9 (diff) |
2.5
From the anti-globalization department:
G.obedit terminated!
Wherever possible, use CTX_data_edit_object(C) to get this
now. It's stored in scene now, and the screen context has
it defined.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index d697ef2de4e..ccbc1cc17a1 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -858,12 +858,13 @@ void delete_material_index() short *totcolp; int a, actcol; - if(G.obedit) { + // if(obedit) { //XXX error("Unable to perform function in EditMode"); - return; - } + // return; + // } + ob= ((G.scene->basact)? (G.scene->basact->object) : 0) ; - if(ob==0 || ob->totcol==0) return; + if(ob==NULL || ob->totcol==0) return; /* take a mesh/curve/mball as starting point, remove 1 index, * AND with all objects that share the ob->data |