[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39757] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: fix [#28401] OpenGL render option disables border clipping
Campbell Barton
ideasman42 at gmail.com
Sun Aug 28 23:13:04 CEST 2011
Revision: 39757
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39757
Author: campbellbarton
Date: 2011-08-28 21:13:03 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
fix [#28401] OpenGL render option disables border clipping
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2011-08-28 19:58:33 UTC (rev 39756)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2011-08-28 21:13:03 UTC (rev 39757)
@@ -2272,6 +2272,7 @@
void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar, int winx, int winy, float viewmat[][4], float winmat[][4])
{
+ RegionView3D *rv3d= ar->regiondata;
Base *base;
float backcol[3];
int bwinx, bwiny;
@@ -2320,6 +2321,9 @@
/* setup view matrices */
view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
+ if(rv3d->rflag & RV3D_CLIPPING)
+ view3d_draw_clipping(rv3d);
+
/* set zbuffer */
if(v3d->drawtype > OB_WIRE) {
v3d->zbuf= TRUE;
@@ -2328,6 +2332,9 @@
else
v3d->zbuf= FALSE;
+ if(rv3d->rflag & RV3D_CLIPPING)
+ view3d_set_clipping(rv3d);
+
/* draw set first */
if(scene->set) {
Scene *sce_iter;
@@ -2363,6 +2370,9 @@
if(v3d->afterdraw_xray.first) view3d_draw_xray(scene, ar, v3d, 1); // clears zbuffer if it is used!
if(v3d->afterdraw_xraytransp.first) view3d_draw_xraytransp(scene, ar, v3d, 1);
+ if(rv3d->rflag & RV3D_CLIPPING)
+ view3d_clr_clipping();
+
/* cleanup */
if(v3d->zbuf) {
v3d->zbuf= FALSE;
More information about the Bf-blender-cvs
mailing list