From 8fbfc150a097731c9a7a66a1c61a6d5a66973f14 Mon Sep 17 00:00:00 2001 From: Vincent Blankfield Date: Thu, 6 Aug 2020 17:04:10 +0200 Subject: Fix T77885: crash rendering grease pencil from compositor with multiple scenes --- source/blender/draw/intern/draw_manager.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 70c117d55b4..43025d9fef4 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1658,7 +1658,6 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph Scene *scene = DEG_get_evaluated_scene(depsgraph); ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph); RenderEngineType *engine_type = engine->type; - RenderData *r = &scene->r; Render *render = engine->re; DRW_render_context_enable(render); @@ -1680,7 +1679,7 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph drw_context_state_init(); DST.viewport = GPU_viewport_create(); - const int size[2] = {(r->size * r->xsch) / 100, (r->size * r->ysch) / 100}; + const int size[2] = {engine->resolution_x, engine->resolution_y}; GPU_viewport_size_set(DST.viewport, size); drw_viewport_var_init(); -- cgit v1.2.3 From 3d35012a050e82c2c363a7c2054fdae75999297a Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Thu, 6 Aug 2020 19:44:28 +0200 Subject: GPencil: Fix unreported wrong Polyline bottom tooltip It was mising the Wheelmouse option and the name of the tool was wrong. --- source/blender/editors/gpencil/gpencil_primitive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 30be9bde7ae..20f959e2e2c 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -412,7 +412,8 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi } else if (tgpi->type == GP_STROKE_POLYLINE) { BLI_strncpy(msg_str, - TIP_("Line: ESC to cancel, LMB to set, Enter/MMB to confirm, Shift to align"), + TIP_("Polyline: ESC to cancel, LMB to set, Enter/MMB to confirm, WHEEL/+- to " + "adjust subdivision number, Shift to align"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_BOX) { -- cgit v1.2.3