diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-09 15:40:33 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-09 15:40:33 +0400 |
| commit | 685bda4b98ab87bf7e6501b35ebd9c2b32bdb47a (patch) | |
| tree | 9c4e3140c2409e5ea736f8847e93ed0af6bbe834 | |
| parent | f98428c39f9420e43a1d4609d7ebc23f048aa5aa (diff) | |
| parent | affb060c200febc1b967fee2c78a3e2ecc6d7c46 (diff) | |
Merging commits 51219 and 51220 from trunk into 2.64a tag
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 2c8db53b534..8be2667a015 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -945,11 +945,6 @@ static int view_zoomdrag_invoke(bContext *C, wmOperator *op, wmEvent *event) dx = fac * BLI_rctf_size_x(&v2d->cur) / 10.0f; dy = fac * BLI_rctf_size_y(&v2d->cur) / 10.0f; - if (U.uiflag & USER_ZOOM_INVERT) { - dx *= -1; - dy *= -1; - } - RNA_float_set(op->ptr, "deltax", dx); RNA_float_set(op->ptr, "deltay", dy); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 313fc0a819e..00e3559fae4 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -79,6 +79,7 @@ #include "BIF_glutil.h" /* for paint cursor */ #include "BLF_api.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" @@ -1838,6 +1839,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) /* mark all library linked objects to be updated */ recalc_all_library_objects(bmain); + IMB_colormanagement_check_file_config(bmain); /* append, rather than linking */ if ((flag & FILE_LINK) == 0) { |