archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bug fix 2309

Browse Source 
Move calls to exit editmode and posemode to "set_scene()". Was causing
errors when, in posemode, switching to empty scene.
This commit is contained in:
Ton Roosendaal
2005-03-11 18:24:15 +00:00
parent 7a0e2a012c
commit 409e0a5c82
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/src/drawscene.c
View File

@@ -64,6 +64,9 @@ void set_scene(Scene *sce) /* also see scene.c: set_scene_bg() */
{ {
bScreen *sc; bScreen *sc;
if( G.obedit) exit_editmode(2);
if(G.obpose) exit_posemode(1);
G.scene= sce; G.scene= sce;
sc= G.main->screen.first; sc= G.main->screen.first;

3
source/blender/src/header_info.c
View File

@@ -422,9 +422,6 @@ void do_info_buttons(unsigned short event)
break; break;
case B_INFOSCE: /* menu select scene */ case B_INFOSCE: /* menu select scene */
if( G.obedit) {
exit_editmode(2);
}
if( G.curscreen->scenenr== -2) { if( G.curscreen->scenenr== -2) {
if(curarea->winy <50) { if(curarea->winy <50) {
sa= closest_bigger_area(); sa= closest_bigger_area();