diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-01-01 21:16:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-01 21:16:10 +0300 |
commit | 58bf29e3898292ad9b46b7c0a591c856dde6eacb (patch) | |
tree | 0809354b81382141417ecc543cf5e00eece26558 /source/blender/blenkernel/intern/material.c | |
parent | 2df4ef711a6dcb2c8874861a181bbc31d0e37f52 (diff) |
removed blenderdef.h, BIF_*, BDR_* and BSE_* header files (except for BIF_gl.h and BIF_glutil.h)
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 42cac46c241..2b94ea0b09c 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -50,7 +50,6 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BKE_bad_level_calls.h" #include "BKE_blender.h" #include "BKE_displist.h" #include "BKE_global.h" @@ -842,7 +841,7 @@ void delete_material_index() int a, actcol; if(G.obedit) { - error("Unable to perform function in EditMode"); + //XXX error("Unable to perform function in EditMode"); return; } ob= ((G.scene->basact)? (G.scene->basact->object) : 0) ; |