[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22254] branches/soc-2009-imbusy/source/ blender: 2 small bugfixes

[Lukas Steiblys]

Revision: 22254
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22254
Author:   imbusy
Date:     2009-08-06 13:20:00 +0200 (Thu, 06 Aug 2009)

Log Message:
-----------
2 small bugfixes

Modified Paths:
--------------
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h
    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-08-06 09:56:14 UTC (rev 22253)
+++ branches/soc-2009-imbusy/source/blender/blenkernel/intern/cdderivedmesh.c	2009-08-06 11:20:00 UTC (rev 22254)
@@ -975,7 +975,7 @@
 		}
 		glEnd();
 	}
-	else {  /* TODO */
+	else {
 		GPUBuffer *buffer = 0;
 		char *varray = 0;
 		int numdata = 0, elementsize = 0, offset;

Modified: branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawmesh.c	2009-08-06 09:56:14 UTC (rev 22253)
+++ branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawmesh.c	2009-08-06 11:20:00 UTC (rev 22254)
@@ -641,6 +641,7 @@
 	draw_textured_begin(scene, v3d, rv3d, ob);
 
 	if(ob == scene->obedit) {
+		glColor4f(1.0f,1.0f,1.0f,1.0f);
 		dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, me->edit_mesh);
 	} else if(faceselect) {
 		if(G.f & G_WEIGHTPAINT)
@@ -652,7 +653,7 @@
 		if( GPU_buffer_legacy(dm) )
 			dm->drawFacesTex(dm, draw_tface__set_draw_legacy);
 		else {
-			glColor3f(1.0f,1.0f,1.0f);
+			glColor4f(1.0f,1.0f,1.0f,1.0f);
 			if( !CustomData_has_layer(&dm->faceData,CD_TEXTURE_MCOL) )
 				add_tface_color_layer(dm);
 			dm->drawFacesTex(dm, draw_tface__set_draw);

Modified: branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h
===================================================================
--- branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h	2009-08-06 09:56:14 UTC (rev 22253)
+++ branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h	2009-08-06 11:20:00 UTC (rev 22254)
@@ -134,8 +134,8 @@
 int GPU_attrib_element_size( GPUAttrib data[], int numdata );
 void GPU_interleaved_attrib_setup( GPUBuffer *buffer, GPUAttrib data[], int numdata );
 
-void GPU_buffer_draw_elements( GPUBuffer *elements, unsigned int mode, int start, int count );
-void *GPU_buffer_lock( GPUBuffer *buffer );
+/* can't lock more than one buffer at once */
+void *GPU_buffer_lock( GPUBuffer *buffer );	
 void *GPU_buffer_lock_stream( GPUBuffer *buffer );
 void GPU_buffer_unlock( GPUBuffer *buffer );
 
@@ -146,8 +146,9 @@
 /* switch color rendering on=1/off=0 */
 void GPU_color_switch( int mode );
 
+void GPU_buffer_draw_elements( GPUBuffer *elements, unsigned int mode, int start, int count );
+
 /* called after drawing */
-void GPU_attrib_unbind( int index );
 void GPU_buffer_unbind();
 
 int GPU_buffer_legacy( struct DerivedMesh *dm );

Modified: branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c	2009-08-06 09:56:14 UTC (rev 22253)
+++ branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c	2009-08-06 11:20:00 UTC (rev 22254)
@@ -1218,8 +1218,10 @@
 {
 	DEBUG_VBO( "GPU_buffer_unlock\n" ); 
 	if( useVBOs ) {
-		if( glUnmapBufferARB( GL_ARRAY_BUFFER_ARB ) == 0 ) {
-			DEBUG_VBO( "Failed to copy new data\n" ); 
+		if( buffer != 0 ) {
+			if( glUnmapBufferARB( GL_ARRAY_BUFFER_ARB ) == 0 ) {
+				DEBUG_VBO( "Failed to copy new data\n" ); 
+			}
 		}
 		glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
 	}