[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16528] trunk/blender/source/gameengine/ Rasterizer/RAS_MaterialBucket.cpp: Fix for bug #17617: GLSL shaders change vertex color unexpectedly.
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Sep 14 23:31:07 CEST 2008
Revision: 16528
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16528
Author: blendix
Date: 2008-09-14 23:31:07 +0200 (Sun, 14 Sep 2008)
Log Message:
-----------
Fix for bug #17617: GLSL shaders change vertex color unexpectedly.
Modified Paths:
--------------
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp 2008-09-14 19:34:06 UTC (rev 16527)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp 2008-09-14 21:31:07 UTC (rev 16528)
@@ -560,7 +560,7 @@
if (m_material->GetDrawingMode() & RAS_IRasterizer::RAS_RENDER_3DPOLYGON_TEXT)
rasty->IndexPrimitives_3DText(ms, m_material, rendertools);
// for multitexturing
- else if((m_material->GetFlag() & RAS_MULTITEX))
+ else if((m_material->GetFlag() & (RAS_MULTITEX|RAS_BLENDERGLSL)))
rasty->IndexPrimitivesMulti(ms);
// use normal IndexPrimitives
else
More information about the Bf-blender-cvs
mailing list