Revision: 23231 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23231 Author: blendix Date: 2009-09-14 21:49:40 +0200 (Mon, 14 Sep 2009)
Log Message: ----------- 2.5 Bugfixes #19343: vertex paint blur was not working. shared vcol was disabled for speed, but blurring still needs it. Also fixed brushes with size > 64 not working correct. #19314: non-zbuffer selection did not work with background image, drawing it made the WM matrix go out of sync. Forgot to mention these in previous commit: * Manipulator type was not properly initialized, .B.blend update helps, but still needed version patch & correct setting for new space. * Added a utility function for the toggling region hide, instead of duplicating the code. * SSS preview render preprocessing pass now also uses multiple threads. * Added version patch for unit scale, was still 0.0. Modified Paths: -------------- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c trunk/blender/source/blender/editors/space_view3d/view3d_draw.c Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c =================================================================== --- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2009-09-14 19:12:29 UTC (rev 23230) +++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2009-09-14 19:49:40 UTC (rev 23231) @@ -710,7 +710,9 @@ if(totface+4>=MAXINDEX) return 0; - if(size>64.0) size= 64.0; + /* brecht: disabled this because it obviously failes for + brushes with size > 64, why is this here? */ + /*if(size>64.0) size= 64.0;*/ ibuf= view3d_read_backbuf(vc, x-size, y-size, x+size, y+size); if(ibuf) { @@ -1732,6 +1734,10 @@ } Mat4SwapMat4(vc->rv3d->persmat, mat); + + /* was disabled because it is slow, but necessary for blur */ + if(vp->mode == VP_BLUR) + do_shared_vertexcol(me); ED_region_tag_redraw(vc->ar); Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c =================================================================== --- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2009-09-14 19:12:29 UTC (rev 23230) +++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2009-09-14 19:49:40 UTC (rev 23231) @@ -1416,12 +1416,9 @@ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - -// glaDefine2DArea(&ar->winrct); + /* need to use wm push/pop matrix because ED_region_pixelspace + uses the wm functions too, otherwise gets out of sync */ + wmPushMatrix(); ED_region_pixelspace(ar); glEnable(GL_BLEND); @@ -1433,10 +1430,7 @@ glPixelZoom(1.0, 1.0); glPixelTransferf(GL_ALPHA_SCALE, 1.0f); - glMatrixMode(GL_PROJECTION); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + wmPopMatrix(); glDisable(GL_BLEND); if(v3d->zbuf) glEnable(GL_DEPTH_TEST); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs