Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-12-18 12:43:08 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-18 12:43:08 +0300
commit8627d65951b56a619419712c963f70b58d7106cb (patch)
tree3d138aeeabc315244eec0452c85ad1c2ed90471d
parent20006e4a677512d709d938c169156566b369b563 (diff)
Correction to previous render border commit
Was using wrong bitfield check.
-rw-r--r--source/blender/editors/space_image/image_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 3667ad9c1d8..8445da8ecab 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -3125,7 +3125,7 @@ static int render_border_exec(bContext *C, wmOperator *op)
}
rd = RE_engine_get_render_data(re);
- if (rd->mode & (R_BORDER|R_CROP)) {
+ if ((rd->mode & (R_BORDER|R_CROP)) == (R_BORDER|R_CROP)) {
BKE_report(op->reports, RPT_INFO, "Can not set border from a cropped render");
return OPERATOR_CANCELLED;
}