[Bf-blender-cvs] [47898a5777d] greasepencil-object: Fix rename fields after merge

Antonio Vazquez noreply at git.blender.org
Tue Nov 28 16:27:41 CET 2017


Commit: 47898a5777dd475a50234fb898b1bd5f896acb30
Author: Antonio Vazquez
Date:   Tue Nov 28 16:27:36 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB47898a5777dd475a50234fb898b1bd5f896acb30

Fix rename fields after merge

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

M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 540292cc6c8..31e0e393ce1 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -667,7 +667,7 @@ static void gpencil_init_evalctx_from_drawctx(const DRWContextState *draw_ctx, E
 	eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, draw_ctx->view_layer, false);
 	eval_ctx->ctime = BKE_scene_frame_get(scene);
 	eval_ctx->view_layer = draw_ctx->view_layer;
-	eval_ctx->engine = draw_ctx->engine;
+	eval_ctx->engine_type = draw_ctx->engine_type;
 }
 
 /* main function to draw strokes */



More information about the Bf-blender-cvs mailing list