[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11049] branches/soc-2007-maike/source/ blender/src/drawobject.c: Limited glsl material preview to solid mode

[Miguel Torres Lima]

Revision: 11049
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11049
Author:   maike
Date:     2007-06-25 20:08:54 +0200 (Mon, 25 Jun 2007)

Log Message:
-----------
Limited glsl material preview to solid mode

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/drawobject.c

Modified: branches/soc-2007-maike/source/blender/src/drawobject.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/drawobject.c	2007-06-25 18:08:31 UTC (rev 11048)
+++ branches/soc-2007-maike/source/blender/src/drawobject.c	2007-06-25 18:08:54 UTC (rev 11049)
@@ -3728,7 +3728,7 @@
 
 	/* GLSL draw */
 	if(glsl_active()  && (base->lay & G.vd->lay)){
-	  if(G.vd->drawtype == OB_SOLID && G.obedit != ob && (OBACT != ob || !(G.f & (G_FACESELECT|G_WEIGHTPAINT|G_TEXTUREPAINT|G_VERTEXPAINT|G_SCULPTMODE)))){
+	  if(G.vd->drawtype == OB_SHADED && G.obedit != ob && (OBACT != ob || !(G.f & (G_FACESELECT|G_WEIGHTPAINT|G_TEXTUREPAINT|G_VERTEXPAINT|G_SCULPTMODE)))){
 	    if(ob->type == OB_MESH){ /* || ob->type == OB_SURF || ob->type == OB_CURVE || ob->type == OB_FONT || ob->type == OB_MBALL){ */
 	      glsl_draw(base);	    
 	      return;