[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21701] branches/blender2.5/blender/source /blender/editors/space_view3d/view3d_header.c: 2.5

Ton Roosendaal ton at blender.org
Sun Jul 19 18:53:57 CEST 2009


Revision: 21701
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21701
Author:   ton
Date:     2009-07-19 18:53:57 +0200 (Sun, 19 Jul 2009)

Log Message:
-----------
2.5

Bugfix: the 'active 3d view layer' was never set, causing issues when
adding new objects. Reported by Martin, thanks!

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c	2009-07-19 16:37:55 UTC (rev 21700)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c	2009-07-19 16:53:57 UTC (rev 21701)
@@ -284,6 +284,21 @@
 	else 
 		v3d->lay = (1<<nr);
 	
+	/* set active layer, ensure to always have one */
+	if(v3d->lay & (1<<nr))
+	   v3d->layact= 1<<nr;
+	else if((v3d->lay & v3d->layact)==0) {
+		int bit= 0;
+		
+		while(bit<32) {
+			if(v3d->lay & (1<<bit)) {
+				v3d->layact= 1<<bit;
+				break;
+			}
+			bit++;
+		}
+	}
+	
 	if(v3d->scenelock) handle_view3d_lock(C);
 	
 	/* new layers might need unflushed events events */





More information about the Bf-blender-cvs mailing list