diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-30 21:07:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-30 21:07:44 +0300 |
commit | 236a11ca63cc736ca15e0ea8cdf377cefc82d4a3 (patch) | |
tree | 33e35eb0e057dc26cf54a9c69d2e8ec5bd15d8c5 /source/blender/editors/screen | |
parent | 61c0de3f48beafd127153bae103a6e0b9b952a1c (diff) |
misc small changes.
- commented unused View3D->flag's
- popup dialog now centers over the mouse
- only overwrite image alpha with render settings on save if saving the render result.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 67ca31fbfff..2f9028d819c 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -307,7 +307,7 @@ int ED_operator_posemode(bContext *C) { Object *obact= CTX_data_active_object(C); - if ((obact != CTX_data_edit_object(C))) { + if (!(obact->mode & OB_MODE_EDIT)) { Object *obpose; if((obpose= ED_object_pose_armature(obact))) { if((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) { |