[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21408] branches/soc-2009-imbusy/source/ blender: fixed an issue with transparency not working in solid mode

[Lukas Steiblys]

Revision: 21408
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21408
Author:   imbusy
Date:     2009-07-07 15:05:53 +0200 (Tue, 07 Jul 2009)

Log Message:
-----------
fixed an issue with transparency not working in solid mode

Modified Paths:
--------------
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c

Modified: branches/soc-2009-imbusy/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/blenkernel/intern/cdderivedmesh.c	2009-07-07 12:23:44 UTC (rev 21407)
+++ branches/soc-2009-imbusy/source/blender/blenkernel/intern/cdderivedmesh.c	2009-07-07 13:05:53 UTC (rev 21408)
@@ -325,8 +325,8 @@
 		if( !GPU_buffer_legacy(dm) ) {
 			glShadeModel(GL_SMOOTH);
 			for( a = 0; a < dm->drawObject->nmaterials; a++ ) {
-				setMaterial(dm->drawObject->materials[a].mat_nr+1, NULL);
-				glDrawArrays(GL_TRIANGLES, dm->drawObject->materials[a].start, dm->drawObject->materials[a].end-dm->drawObject->materials[a].start);
+				if( setMaterial(dm->drawObject->materials[a].mat_nr+1, NULL) )
+					glDrawArrays(GL_TRIANGLES, dm->drawObject->materials[a].start, dm->drawObject->materials[a].end-dm->drawObject->materials[a].start);
 			}
 		}
 		GPU_buffer_unbind( );

Modified: branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c	2009-07-07 12:23:44 UTC (rev 21407)
+++ branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c	2009-07-07 13:05:53 UTC (rev 21408)
@@ -536,8 +536,8 @@
 void GPU_buffer_copy_color3( DerivedMesh *dm, float *varray_, int *index, int *redir, void *user )
 {
 	int i;
-	unsigned char *varray = varray_;
-	unsigned char *mcol = user;
+	unsigned char *varray = (unsigned char *)varray_;
+	unsigned char *mcol = (unsigned char *)user;
 	MFace *mface = dm->getFaceArray(dm);
 
 	DEBUG_VBO("GPU_buffer_copy_color3\n");
@@ -565,8 +565,8 @@
 void GPU_buffer_copy_color4( DerivedMesh *dm, float *varray_, int *index, int *redir, void *user )
 {
 	int i;
-	unsigned char *varray = varray_;
-	unsigned char *mcol = user;
+	unsigned char *varray = (unsigned char *)varray_;
+	unsigned char *mcol = (unsigned char *)user;
 	MFace *mface = dm->getFaceArray(dm);
 
 	DEBUG_VBO("GPU_buffer_copy_color4\n");