[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17054] trunk/blender/source/blender/src/ outliner.c: missing calls to countall() on switching scenes in the outliner .
Campbell Barton
ideasman42 at gmail.com
Mon Oct 13 05:56:00 CEST 2008
Revision: 17054
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17054
Author: campbellbarton
Date: 2008-10-13 05:55:59 +0200 (Mon, 13 Oct 2008)
Log Message:
-----------
missing calls to countall() on switching scenes in the outliner.
Modified Paths:
--------------
trunk/blender/source/blender/src/outliner.c
Modified: trunk/blender/source/blender/src/outliner.c
===================================================================
--- trunk/blender/source/blender/src/outliner.c 2008-10-13 00:35:58 UTC (rev 17053)
+++ trunk/blender/source/blender/src/outliner.c 2008-10-13 03:55:59 UTC (rev 17054)
@@ -1579,6 +1579,7 @@
}
if(ob!=G.obedit) exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR);
+ else countall(); /* exit_editmode calls countall() */
}
static int tree_element_active_material(SpaceOops *soops, TreeElement *te, int set)
@@ -1737,6 +1738,7 @@
if(sce && G.scene != sce) {
if(G.obedit) exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR);
set_scene(sce);
+ countall();
}
}
@@ -2250,6 +2252,7 @@
if(G.scene!=(Scene *)tselem->id) {
if(G.obedit) exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR);
set_scene((Scene *)tselem->id);
+ countall();
}
}
else if(ELEM5(te->idcode, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) {
@@ -2917,7 +2920,10 @@
if(tselem->type==0 && te->idcode==ID_OB) {
// when objects selected in other scenes... dunno if that should be allowed
Scene *sce= (Scene *)outliner_search_back(soops, te, ID_SCE);
- if(sce && G.scene != sce) set_scene(sce);
+ if(sce && G.scene != sce) {
+ set_scene(sce);
+ countall();
+ }
operation_cb(te, NULL, tselem);
}
@@ -3049,7 +3055,10 @@
if(event==1) {
Scene *sce= G.scene; // to be able to delete, scenes are set...
outliner_do_object_operation(soops, &soops->tree, object_select_cb);
- if(G.scene != sce) set_scene(sce);
+ if(G.scene != sce) {
+ set_scene(sce);
+ countall();
+ }
str= "Select Objects";
}
More information about the Bf-blender-cvs
mailing list