[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33804] trunk/blender/source/blender: fix [#25313] Outliner View Active only works once icon has been shown in view.

Campbell Barton ideasman42 at gmail.com
Mon Dec 20 10:51:18 CET 2010


Revision: 33804
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33804
Author:   campbellbarton
Date:     2010-12-20 10:51:18 +0100 (Mon, 20 Dec 2010)

Log Message:
-----------
fix [#25313] Outliner View Active only works once icon has been shown in view.
also disable UNDO and REGISTER flags for OUTLINER_OT_show_active() since its just scrolling the view.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-12-20 09:46:30 UTC (rev 33803)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-12-20 09:51:18 UTC (rev 33804)
@@ -2715,7 +2715,7 @@
 		if(tselem->type==0) {
 			if(tselem->id==id) return te;
 			/* only deeper on scene or object */
-			if( te->idcode==ID_OB || te->idcode==ID_SCE) { 
+			if( te->idcode==ID_OB || te->idcode==ID_SCE || (soops->outlinevis == SO_GROUPS && te->idcode==ID_GR)) {
 				tes= outliner_find_id(soops, &te->subtree, id);
 				if(tes) return tes;
 			}
@@ -2770,8 +2770,6 @@
 	/* callbacks */
 	ot->exec= outliner_show_active_exec;
 	ot->poll= ED_operator_outliner_active;
-	
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
 /* tse is not in the treestore, we use its contents to find a match */

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2010-12-20 09:46:30 UTC (rev 33803)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2010-12-20 09:51:18 UTC (rev 33804)
@@ -240,9 +240,8 @@
 	/* search stuff */
 	char search_string[32];
 	struct TreeStoreElem search_tse;
-	int search_flags, do_;
-	
-	short flag, outlinevis, storeflag, pad;
+
+	short flag, outlinevis, storeflag, search_flags;
 } SpaceOops;
 
 typedef struct SpaceImage {





More information about the Bf-blender-cvs mailing list