[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34572] trunk/blender/source/blender/ editors/space_outliner/outliner.c: Bugfix #25859

Ton Roosendaal ton at blender.org
Sun Jan 30 18:03:02 CET 2011


Revision: 34572
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34572
Author:   ton
Date:     2011-01-30 17:03:01 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Bugfix #25859

Outliner: click on 'restrict' options also selected/deselected the
item itself. Fix provided by Alexander Kuznetsov. Thanks!

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

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2011-01-30 16:57:28 UTC (rev 34571)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2011-01-30 17:03:01 UTC (rev 34572)
@@ -2560,9 +2560,12 @@
 	TreeElement *te;
 	float fmval[2];
 	int extend= RNA_boolean_get(op->ptr, "extend");
-	
+
 	UI_view2d_region_to_view(&ar->v2d, event->x - ar->winrct.xmin, event->y - ar->winrct.ymin, fmval, fmval+1);
-	
+
+	if(!ELEM3(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF, SO_KEYMAP) && !(soops->flag & SO_HIDE_RESTRICTCOLS) && fmval[0] > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX)
+		return OPERATOR_CANCELLED;
+
 	for(te= soops->tree.first; te; te= te->next) {
 		if(do_outliner_item_activate(C, scene, ar, soops, te, extend, fmval)) break;
 	}




More information about the Bf-blender-cvs mailing list