[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20537] branches/soc-2009-yukishiro/source /blender: a small fix in drawobject for light paint

Jingyuan Huang jingyuan.huang at gmail.com
Sun May 31 18:55:16 CEST 2009


Revision: 20537
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20537
Author:   yukishiro
Date:     2009-05-31 18:55:15 +0200 (Sun, 31 May 2009)

Log Message:
-----------
a small fix in drawobject for light paint

Modified Paths:
--------------
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-yukishiro/source/blender/sh/intern/compute.c

Modified: branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c	2009-05-31 16:45:30 UTC (rev 20536)
+++ branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c	2009-05-31 16:55:15 UTC (rev 20537)
@@ -2418,6 +2418,8 @@
                                 }
 
                                 dm->drawFacesColored(dm, me->flag, shcol, NULL);
+				glDisable(GL_COLOR_MATERIAL);
+				GPU_disable_material();
                         }
 			else do_draw= 1;
 		}

Modified: branches/soc-2009-yukishiro/source/blender/sh/intern/compute.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/sh/intern/compute.c	2009-05-31 16:45:30 UTC (rev 20536)
+++ branches/soc-2009-yukishiro/source/blender/sh/intern/compute.c	2009-05-31 16:55:15 UTC (rev 20537)
@@ -252,7 +252,7 @@
 
 void SH_ComputeSceneCoefficients(Scene *scene, View3D *v3d)
 {
-		Base *base = NULL;
+        Base *base = NULL;
         Object *ob;
         Mesh *me;
         DerivedMesh *dm;





More information about the Bf-blender-cvs mailing list