[Bf-blender-cvs] [8627d65] master: Correction to previous render border commit

[Sergey Sharybin]

Commit: 8627d65951b56a619419712c963f70b58d7106cb
Author: Sergey Sharybin
Date:   Thu Dec 18 14:43:08 2014 +0500
Branches: master
https://developer.blender.org/rB8627d65951b56a619419712c963f70b58d7106cb

Correction to previous render border commit

Was using wrong bitfield check.

===================================================================

M	source/blender/editors/space_image/image_ops.c

===================================================================

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 3667ad9..8445da8 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;
 	}