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
path: root/source
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-02-10 14:57:11 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-02-10 14:57:47 +0300
commitbdfd9ba38abcb588eafb6413ed24ad5c310a44cb (patch)
tree84d308062364ba08280829608fad4835424044d7 /source
parent0ea64c2b9abe500061a6a510874d4f26116ae6aa (diff)
Cleanup leftover code from WIP renderer
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenloader/intern/readfile.c1
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c4
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h3
3 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a04e8c8db6d..ca02507a050 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6552,7 +6552,6 @@ static bool direct_link_screen(FileData *fd, bScreen *sc)
}
v3d->localvd = newdataadr(fd, v3d->localvd);
BLI_listbase_clear(&v3d->afterdraw_transp);
- BLI_listbase_clear(&v3d->gpu_material);
BLI_listbase_clear(&v3d->afterdraw_xray);
BLI_listbase_clear(&v3d->afterdraw_xraytransp);
v3d->properties_storage = NULL;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 59c6f2ca21c..7c80c71da28 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -95,7 +95,6 @@
#include "GPU_material.h"
#include "GPU_extensions.h"
#include "GPU_compositing.h"
-#include "GPU_renderer.h"
#include "view3d_intern.h" /* own include */
@@ -2799,9 +2798,6 @@ static void view3d_draw_objects(
if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
}
- /* draw sorted materials in the gpu renderer */
- if (v3d->gpu_material.first) GPU_renderer_material_draw(&v3d->gpu_material);
-
/* transp and X-ray afterdraw stuff */
if (v3d->afterdraw_transp.first) view3d_draw_transp(scene, ar, v3d);
if (v3d->afterdraw_xray.first) view3d_draw_xray(scene, ar, v3d, true);
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 1e952b04e7c..d68fedbfb89 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -214,9 +214,6 @@ typedef struct View3D {
struct ListBase afterdraw_xray;
struct ListBase afterdraw_xraytransp;
- /* list of gpu materials to draw */
- struct ListBase gpu_material;
-
/* drawflags, denoting state */
char zbuf, transp, xray;
char pad3;