[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50872] trunk/blender/source/blender/ editors/space_outliner/outliner_draw.c: fix for error disabling group visibility (which was flushed down to obects ),
Campbell Barton
ideasman42 at gmail.com
Tue Sep 25 06:15:12 CEST 2012
Revision: 50872
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50872
Author: campbellbarton
Date: 2012-09-25 04:15:09 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
fix for error disabling group visibility (which was flushed down to obects),
- objects were being selected rather then de-selected.
- object restrict selection wasnt de-selecting either (as it does when changing the object in the outliner directly).
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-09-25 03:00:33 UTC (rev 50871)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-09-25 04:15:09 UTC (rev 50872)
@@ -256,10 +256,12 @@
/* not in editmode */
if (scene->obedit != gob->ob) {
gob->ob->restrictflag |= flag;
-
- if (flag == OB_RESTRICT_VIEW)
- if ((gob->ob->flag & SELECT) == 0)
- ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_SELECT);
+
+ if (ELEM(flag, OB_RESTRICT_SELECT, OB_RESTRICT_VIEW)) {
+ if ((gob->ob->flag & SELECT)) {
+ ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_DESELECT);
+ }
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list