[Bf-blender-cvs] [2bdd44c] master: Correction to set border from render image view

[Sergey Sharybin]

Commit: 2bdd44c87af1f7fda14939f9299f53a07d025ba8
Author: Sergey Sharybin
Date:   Thu Dec 18 13:24:21 2014 +0500
Branches: master
https://developer.blender.org/rB2bdd44c87af1f7fda14939f9299f53a07d025ba8

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.

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

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 b8043d9..3667ad9 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);