Commit: 7281d36a20b3615ba630842f9697d954676fd4bf
Author: Antonio Vazquez
Date: Fri Apr 13 16:05:33 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7281d36a20b3615ba630842f9697d954676fd4bf
Fix parameter list errors after merge
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/modifiers/intern/MOD_gpencilhook.c
M source/blender/modifiers/intern/MOD_gpencillattice.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 bd4220a50e8..4b9442da2be 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -480,7 +480,6 @@ 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_type = draw_ctx->engine_type;
}
/* main function to draw strokes */
diff --git a/source/blender/modifiers/intern/MOD_gpencilhook.c
b/source/blender/modifiers/intern/MOD_gpencilhook.c
index 3f2c2efbad5..d51d252c854 100644
--- a/source/blender/modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/modifiers/intern/MOD_gpencilhook.c
@@ -274,7 +274,7 @@ static void bakeModifierGP(const bContext *C, const
EvaluationContext *eval_ctx,
* NOTE: this assumes that we don't want hook animation
on non-keyframed frames
*/
CFRA = gpf->framenum;
- BKE_scene_graph_update_for_newframe(&eval_ctx_copy,
depsgraph, bmain, scene, view_layer);
+ BKE_scene_graph_update_for_newframe(depsgraph, bmain);
/* compute hook effects on this frame */
for (bGPDstroke *gps = gpf->strokes.first; gps; gps =
gps->next) {
@@ -285,7 +285,7 @@ static void bakeModifierGP(const bContext *C, const
EvaluationContext *eval_ctx,
/* return frame state and DB to original state */
CFRA = oldframe;
- BKE_scene_graph_update_for_newframe(&eval_ctx_copy, depsgraph, bmain,
scene, view_layer);
+ BKE_scene_graph_update_for_newframe(depsgraph, bmain);
}
static void freeData(ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c
b/source/blender/modifiers/intern/MOD_gpencillattice.c
index 642d54ebb94..5c97284c766 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -123,7 +123,7 @@ static void bakeModifierGP(const bContext *C, const
EvaluationContext *eval_ctx,
* NOTE: this assumes that we don't want lattice
animation on non-keyframed frames
*/
CFRA = gpf->framenum;
- BKE_scene_graph_update_for_newframe(&eval_ctx_copy,
depsgraph, bmain, scene, view_layer);
+ BKE_scene_graph_update_for_newframe(depsgraph, bmain);
/* recalculate lattice data */
BKE_gpencil_lattice_init(ob);
@@ -144,7 +144,7 @@ static void bakeModifierGP(const bContext *C, const
EvaluationContext *eval_ctx,
/* return frame state and DB to original state */
CFRA = oldframe;
- BKE_scene_graph_update_for_newframe(&eval_ctx_copy, depsgraph, bmain,
scene, view_layer);
+ BKE_scene_graph_update_for_newframe(depsgraph, bmain);
}
static void freeData(ModifierData *md)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
