[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32033] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix #23754: glsl + constructive curve modifier not drawing correct.

[Brecht Van Lommel]

Revision: 32033
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32033
Author:   blendix
Date:     2010-09-20 23:57:29 +0200 (Mon, 20 Sep 2010)

Log Message:
-----------
Fix #23754: glsl + constructive curve modifier not drawing correct.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-09-20 21:11:38 UTC (rev 32032)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-09-20 21:57:29 UTC (rev 32033)
@@ -3075,12 +3075,15 @@
 		int glsl = draw_glsl_material(scene, ob, v3d, dt);
 		GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
 
-		if (!glsl)
+		if(!glsl) {
 			glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
+			glEnable(GL_LIGHTING);
+			dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
+			glDisable(GL_LIGHTING);
+		}
+		else
+			dm->drawFacesGLSL(dm, GPU_enable_material);
 
-		glEnable(GL_LIGHTING);
-		dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
-		glDisable(GL_LIGHTING);
 		GPU_end_object_materials();
 	} else {
 		if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_SOLID)==0)