[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56988] trunk/blender/source/blender: fix [#35488] Toggle "Show All Layers"

Campbell Barton ideasman42 at gmail.com
Thu May 23 23:24:56 CEST 2013


Revision: 56988
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56988
Author:   campbellbarton
Date:     2013-05-23 21:24:56 +0000 (Thu, 23 May 2013)
Log Message:
-----------
fix [#35488] Toggle "Show All Layers" 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2013-05-23 21:14:17 UTC (rev 56987)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2013-05-23 21:24:56 UTC (rev 56988)
@@ -137,16 +137,17 @@
 
 	if (nr == 0) {
 		/* all layers */
-		if (!v3d->layact)
-			v3d->layact = 1;
+		if (!v3d->lay_prev)
+			v3d->lay_prev = 1;
 
 		if (toggle && v3d->lay == ((1 << 20) - 1)) {
 			/* return to active layer only */
-			v3d->lay = v3d->layact;
+			v3d->lay = v3d->lay_prev;
 
 			view3d_layers_editmode_ensure(scene, v3d);
 		}
 		else {
+			v3d->lay_prev = v3d->lay;
 			v3d->lay |= (1 << 20) - 1;
 		}
 	}

Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2013-05-23 21:14:17 UTC (rev 56987)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2013-05-23 21:24:56 UTC (rev 56988)
@@ -163,8 +163,9 @@
 
 	float bundle_size;			/* size of bundles in reconstructed data */
 	char bundle_drawtype;		/* display style for bundle */
-	char pad[7];
+	char pad[3];
 
+	unsigned int lay_prev; /* for active layer toggle */
 	unsigned int lay_used; /* used while drawing */
 	
 	short persp  DNA_DEPRECATED;




More information about the Bf-blender-cvs mailing list