[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27765] trunk/blender/source/blender/ editors/space_view3d/view3d_header.c: Fix [#21759] Toggle all layers doesn' t work

[Matt Ebb]

Revision: 27765
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27765
Author:   broken
Date:     2010-03-26 09:32:54 +0100 (Fri, 26 Mar 2010)

Log Message:
-----------
Fix [#21759] Toggle all layers doesn't work

Toggling all layers will revert back to the active layer.

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

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c   
2010-03-26 07:21:48 UTC (rev 27764)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c   
2010-03-26 08:32:54 UTC (rev 27765)
@@ -159,14 +159,18 @@
        
        if(nr < 0)
                return OPERATOR_CANCELLED;
-       
-       
+
        if(nr == 0) {
                /* all layers */
-               v3d->lay |= (1<<20)-1;
-
                if(!v3d->layact)
                        v3d->layact= 1;
+
+               if (toggle && v3d->lay == ((1<<20)-1)) {
+                       /* return to active layer only */
+                       v3d->lay = v3d->layact;
+               } else {
+                       v3d->lay |= (1<<20)-1;
+               }               
        }
        else {
                int bit;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs