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:
authorNicholas Bishop <nicholasbishop@gmail.com>2012-03-06 07:34:27 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2012-03-06 07:34:27 +0400
commit919a0d99fb8f28ecc988a9e4f74daf65e56f6298 (patch)
treedc7cb490edf24d92120e872edcd673db22ed6a72 /source
parentc7ffe7f621810f61e53343850ce42f367830fad9 (diff)
Code cleanup: remove some PBVH material code that isn't needed anymore.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/cdderivedmesh.c4
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index b868d6fbcea..25f78414204 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -525,10 +525,6 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm,
if(dm->numTessFaceData) {
float (*face_nors)[3] = CustomData_get_layer(&dm->faceData, CD_NORMAL);
- /* should be per face */
- if(!setMaterial(mface->mat_nr+1, NULL))
- return;
-
BLI_pbvh_draw(cddm->pbvh, partial_redraw_planes, face_nors, setMaterial);
glShadeModel(GL_FLAT);
}
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 56f998cf2aa..d60793d193f 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1548,10 +1548,6 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes)
if(ccgdm->pbvh && ccgdm->multires.mmd && !fast) {
if(dm->numTessFaceData) {
- /* should be per face */
- if(!setMaterial(faceFlags[0].mat_nr+1, NULL))
- return;
-
BLI_pbvh_draw(ccgdm->pbvh, partial_redraw_planes, NULL, setMaterial);
glShadeModel(GL_FLAT);
}