diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-03-23 22:21:43 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-03-23 22:21:43 +0300 |
| commit | 0ad76a613da40312aef648679a3161117bd9dfae (patch) | |
| tree | 91cc024f48bf88cd7f7e0bcee62b8369f57ec7ca | |
| parent | b264636469d9d71b7a100a77b6e6fa246a5fa155 (diff) | |
bug fix #2367
Activate object in oops, while in posemode (or even editmode) was possible,
potentially causing all kinds of nasty stuff.
| -rw-r--r-- | source/blender/src/editoops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c index 736e2427543..ce1bd9f34de 100644 --- a/source/blender/src/editoops.c +++ b/source/blender/src/editoops.c @@ -111,7 +111,7 @@ static void oops_to_select_objects(void) while(base) { if(base->flag != base->object->flag) { base->flag= base->object->flag; - set_active_base(base); + if(G.obedit==NULL && G.obpose==NULL) set_active_base(base); } base= base->next; } @@ -410,7 +410,7 @@ static void do_activate_oops(Oops *oops) base= base->next; } if(base) { - set_active_base(base); /* editview.c */ + if(G.obedit==NULL && G.obpose==NULL) set_active_base(base); /* editview.c */ allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWOOPS, 0); allqueue(REDRAWINFO, 1); |