Correction to set border from render image view

It did not fully support cases when setting border from a cropped render result
and it's not totally clear how it should behave. So for now just do nothing and
inform users about this.

1 files changed, 15 insertions, 0 deletions

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index b8043d9f0de..3667ad9c1d8 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -92,6 +92,8 @@
 
 #include "PIL_time.h"
 
+#include "RE_engine.h"
+
 #include "image_intern.h"
 
 /******************** view navigation utilities *********************/
@@ -3113,8 +3115,21 @@ static int render_border_exec(bContext *C, wmOperator *op)
 {
 	ARegion *ar = CTX_wm_region(C);
 	Scene *scene = CTX_data_scene(C);
+	Render *re = RE_GetRender(scene->id.name);
+	RenderData *rd;
 	rctf border;
 
+	if (re == NULL) {
+		/* Shouldn't happen, but better be safe close to the release. */
+		return OPERATOR_CANCELLED;
+	}
+
+	rd = RE_engine_get_render_data(re);
+	if (rd->mode & (R_BORDER|R_CROP)) {
+		BKE_report(op->reports, RPT_INFO, "Can not set border from a cropped render");
+		return OPERATOR_CANCELLED;
+	}
+
 	/* get rectangle from operator */
 	WM_operator_properties_border_to_rctf(op, &border);
 	UI_view2d_region_to_view_rctf(&ar->v2d, &border, &border);