[Bf-blender-cvs] [bdfd9ba] viewport_experiments: Cleanup leftover code from WIP renderer
Antony Riakiotakis
noreply at git.blender.org
Thu Feb 12 16:40:17 CET 2015
Commit: bdfd9ba38abcb588eafb6413ed24ad5c310a44cb
Author: Antony Riakiotakis
Date: Tue Feb 10 12:57:11 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rBbdfd9ba38abcb588eafb6413ed24ad5c310a44cb
Cleanup leftover code from WIP renderer
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a04e8c8..ca02507 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 59c6f2c..7c80c71 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 1e952b0..d68fedb 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;
More information about the Bf-blender-cvs
mailing list