forked from bartvdbraak/blender
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.
This commit is contained in:
parent
0c5eb88451
commit
2bdd44c87a
@ -92,6 +92,8 @@
|
|||||||
|
|
||||||
#include "PIL_time.h"
|
#include "PIL_time.h"
|
||||||
|
|
||||||
|
#include "RE_engine.h"
|
||||||
|
|
||||||
#include "image_intern.h"
|
#include "image_intern.h"
|
||||||
|
|
||||||
/******************** view navigation utilities *********************/
|
/******************** view navigation utilities *********************/
|
||||||
@ -3113,8 +3115,21 @@ static int render_border_exec(bContext *C, wmOperator *op)
|
|||||||
{
|
{
|
||||||
ARegion *ar = CTX_wm_region(C);
|
ARegion *ar = CTX_wm_region(C);
|
||||||
Scene *scene = CTX_data_scene(C);
|
Scene *scene = CTX_data_scene(C);
|
||||||
|
Render *re = RE_GetRender(scene->id.name);
|
||||||
|
RenderData *rd;
|
||||||
rctf border;
|
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 */
|
/* get rectangle from operator */
|
||||||
WM_operator_properties_border_to_rctf(op, &border);
|
WM_operator_properties_border_to_rctf(op, &border);
|
||||||
UI_view2d_region_to_view_rctf(&ar->v2d, &border, &border);
|
UI_view2d_region_to_view_rctf(&ar->v2d, &border, &border);
|
||||||
|
Loading…
Reference in New Issue
Block a user