[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44666] trunk/blender/source/blender/ blenkernel/intern: Code cleanup: remove some PBVH material code that isn' t needed anymore.

[Nicholas Bishop]

Revision: 44666
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44666
Author:   nicholasbishop
Date:     2012-03-06 03:34:27 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Code cleanup: remove some PBVH material code that isn't needed anymore.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-03-06 02:40:08 UTC (rev 44665)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-03-06 03:34:27 UTC (rev 44666)
@@ -525,10 +525,6 @@
 		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);
 		}

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-03-06 02:40:08 UTC (rev 44665)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-03-06 03:34:27 UTC (rev 44666)
@@ -1548,10 +1548,6 @@
 
 	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);
 		}