[Bf-blender-cvs] [e7a016d368e] greasepencil-object: Fix compiler error
Antonio Vazquez
noreply at git.blender.org
Wed Nov 8 08:53:01 CET 2017
Commit: e7a016d368e4b5736eedd1a75b102995d605fcca
Author: Antonio Vazquez
Date: Wed Nov 8 08:52:52 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe7a016d368e4b5736eedd1a75b102995d605fcca
Fix compiler error
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.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 eecf8b244ae..a2ecb23ec7c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -664,7 +664,7 @@ static void gpencil_init_evalctx_from_drawctx(const DRWContextState *draw_ctx, E
{
Scene *scene = draw_ctx->scene;
- eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, draw_ctx->scene_layer);
+ eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, draw_ctx->scene_layer, false);
eval_ctx->ctime = BKE_scene_frame_get(scene);
eval_ctx->scene_layer = draw_ctx->scene_layer;
eval_ctx->engine = draw_ctx->engine;
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c b/source/blender/modifiers/intern/MOD_gpencillattice.c
index 26095381b4c..b993dab082f 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -110,7 +110,7 @@ static void bakeModifierGP(const bContext *C, const EvaluationContext *eval_ctx,
int oldframe = CFRA;
/* Get depsgraph and scene layer */
SceneLayer *scene_layer = BKE_scene_layer_from_scene_get(scene);
- Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer);
+ Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false);
if (mmd->object == NULL)
return;
More information about the Bf-blender-cvs
mailing list