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:
authorCampbell Barton <ideasman42@gmail.com>2011-05-10 18:48:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-10 18:48:06 +0400
commit89a166d0deb5587ff89bf4d07f8533bf55fc5d8f (patch)
treed72e0327a80267082ad4f287e24cc28dbcf30cac /source/blender/blenkernel/intern/displist.c
parent1d53ea0a6551ef84db139268abf045a328e26978 (diff)
remove some duplicate declarations
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
-rw-r--r--source/blender/blenkernel/intern/displist.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 29b9fd5eab7..a8351e0bb1b 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -72,6 +72,8 @@
#include "ED_curve.h" /* for BKE_curve_nurbs */
+extern Material defmaterial; /* material.c */
+
static void boundbox_displist(Object *ob);
void free_disp_elem(DispList *dl)
@@ -552,7 +554,6 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un
}
for (i=0; i<totface; i++) {
- extern Material defmaterial; /* material.c */
MFace *mf= &mface[i];
Material *ma= give_current_material(ob, mf->mat_nr+1);
int j, vidx[4], nverts= mf->v4?4:3;
@@ -664,8 +665,6 @@ void shadeDispList(Scene *scene, Base *base)
dl= ob->disp.first;
while(dl) {
- extern Material defmaterial; /* material.c */
-
dlob= MEM_callocN(sizeof(DispList), "displistshade");
BLI_addtail(&ob->disp, dlob);
dlob->type= DL_VERTCOL;
@@ -734,8 +733,6 @@ void shadeDispList(Scene *scene, Base *base)
if(dl->type==DL_INDEX4) {
if(dl->nors) {
- extern Material defmaterial; /* material.c */
-
if(dl->col1) MEM_freeN(dl->col1);
col1= dl->col1= MEM_mallocN(sizeof(int)*dl->nr, "col1");