[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14199] trunk/blender/source/blender: make border zoom ignore backfaces in texture mode and zero alpha areas of billboards .

[Campbell Barton]

Revision: 14199
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14199
Author:   campbellbarton
Date:     2008-03-21 17:27:43 +0100 (Fri, 21 Mar 2008)

Log Message:
-----------
make border zoom ignore backfaces in texture mode and zero alpha areas of billboards.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h
    trunk/blender/source/blender/src/drawview.c

Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2008-03-21 16:10:53 UTC (rev 14198)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2008-03-21 16:27:43 UTC (rev 14199)
@@ -103,7 +103,7 @@
 	
 	/**
 	 * The drawing mode for the 3d display. Set to OB_WIRE, OB_SOLID,
-	 * OB_SHADED or OB_TEXTURED */
+	 * OB_SHADED or OB_TEXTURE */
 	short drawtype;
 	short localview;
 	int lay, layact;

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2008-03-21 16:10:53 UTC (rev 14198)
+++ trunk/blender/source/blender/src/drawview.c	2008-03-21 16:27:43 UTC (rev 14199)
@@ -2894,14 +2894,21 @@
 	View3D *v3d= spacedata;
 	Base *base;
 	Scene *sce;
-	short drawtype, zbuf;
+	short drawtype, zbuf, flag;
+	float glalphaclip;
+	/* temp set drawtype to solid */
 	
-	/* temp set drawtype to solid */
+	/* Setting these temporarily is not nice */
 	drawtype = v3d->drawtype;
 	zbuf = v3d->zbuf;
-	v3d->drawtype = OB_SOLID;
+	flag = v3d->flag;
+	glalphaclip = U.glalphaclip;
 	
-	
+	U.glalphaclip = 0.5; /* not that nice but means we wont zoom into billboards */
+	v3d->flag &= ~V3D_SELECT_OUTLINE;
+	if ((v3d->drawtype != OB_SOLID) && (v3d->drawtype != OB_TEXTURE)) 
+		v3d->drawtype = OB_SOLID;
+
 	setwinmatrixview3d(sa->winx, sa->winy, NULL);	/* 0= no pick rect */
 	setviewmatrixview3d();	/* note: calls where_is_object for camera... */
 	
@@ -2980,6 +2987,8 @@
 	
 	v3d->drawtype = drawtype;
 	v3d->zbuf = zbuf;
+	U.glalphaclip = glalphaclip;
+	v3d->flag = flag;
 }
 
 static void draw_viewport_fps(ScrArea *sa);