diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-10 18:48:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-10 18:48:06 +0400 |
commit | 89a166d0deb5587ff89bf4d07f8533bf55fc5d8f (patch) | |
tree | d72e0327a80267082ad4f287e24cc28dbcf30cac /source/blender/gpu | |
parent | 1d53ea0a6551ef84db139268abf045a328e26978 (diff) |
remove some duplicate declarations
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 25be2e2aeb4..0e7df43bd34 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -76,6 +76,8 @@ #include "smoke_API.h" +extern Material defmaterial; /* from material.c */ + /* These are some obscure rendering functions shared between the * game engine and the blender, in this module to avoid duplicaten * and abstract them away from the rest a bit */ @@ -951,7 +953,6 @@ static Material *gpu_active_node_material(Material *ma) void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, Object *ob, int glsl, int *do_alpha_pass) { - extern Material defmaterial; /* from material.c */ Material *ma; GPUMaterial *gpumat; GPUBlendMode blendmode; @@ -1042,7 +1043,6 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O int GPU_enable_material(int nr, void *attribs) { - extern Material defmaterial; /* from material.c */ GPUVertexAttribs *gattribs = attribs; GPUMaterial *gpumat; GPUBlendMode blendmode; |