Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index ccbc1cc17a1..d34bd02cbcd 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -849,21 +849,15 @@ void automatname(Material *ma)
}
-void delete_material_index()
+void delete_material_index(Object *ob)
{
Material *mao, ***matarar;
- Object *ob, *obt;
+ Object *obt;
Curve *cu;
Nurb *nu;
short *totcolp;
int a, actcol;
- // if(obedit) {
- //XXX error("Unable to perform function in EditMode");
- // return;
- // }
-
- ob= ((G.scene->basact)? (G.scene->basact->object) : 0) ;
if(ob==NULL || ob->totcol==0) return;
/* take a mesh/curve/mball as starting point, remove 1 index,