[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55341] trunk/blender/source/blender/ editors/mesh: Bug fix, irc reported:

Ton Roosendaal ton at blender.org
Sat Mar 16 18:12:41 CET 2013


Revision: 55341
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55341
Author:   ton
Date:     2013-03-16 17:12:39 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
Bug fix, irc reported:

Using new off-screen backbuffer selection failed for Lasso in editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/CMakeLists.txt
    trunk/blender/source/blender/editors/mesh/editmesh_select.c

Modified: trunk/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/mesh/CMakeLists.txt	2013-03-16 16:41:12 UTC (rev 55340)
+++ trunk/blender/source/blender/editors/mesh/CMakeLists.txt	2013-03-16 17:12:39 UTC (rev 55341)
@@ -26,6 +26,7 @@
 	../../blenlib
 	../../blenloader
 	../../bmesh
+	../../gpu
 	../../imbuf
 	../../makesdna
 	../../makesrna

Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-03-16 16:41:12 UTC (rev 55340)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c	2013-03-16 17:12:39 UTC (rev 55341)
@@ -66,6 +66,8 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
+#include "GPU_extensions.h"
+
 #include "mesh_intern.h"
 
 #include "UI_resources.h"
@@ -253,6 +255,9 @@
 
 	dr = buf->rect;
 
+	if (vc->rv3d->gpuoffscreen)
+		GPU_offscreen_bind(vc->rv3d->gpuoffscreen);
+	
 	/* draw the mask */
 	glDisable(GL_DEPTH_TEST);
 	
@@ -270,6 +275,9 @@
 	
 	glFinish(); /* to be sure readpixels sees mask */
 	
+	if (vc->rv3d->gpuoffscreen)
+		GPU_offscreen_unbind(vc->rv3d->gpuoffscreen);
+	
 	/* grab mask */
 	bufmask = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
 




More information about the Bf-blender-cvs mailing list