[Bf-blender-cvs] [7bf104abd7e] greasepencil-object: Compile fixes after merge

[Joshua Leung]

Commit: 7bf104abd7e3db746bf895c6d7bf1857376e57a0
Author: Joshua Leung
Date:   Fri Nov 10 12:39:28 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB7bf104abd7e3db746bf895c6d7bf1857376e57a0

Compile fixes after merge

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

M	source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc
M	source/blender/draw/modes/object_mode.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/modifiers/intern/MOD_gpencillattice.c

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc
index cf60cd88980..78c8d2050e6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene_layer.cc
@@ -126,7 +126,7 @@ void DepsgraphNodeBuilder::build_scene_layer(Scene *scene,
 	}
 
 	/* Palettes. */
-	LINKLIST_FOREACH(Palette *, palette, &bmain->palettes) {
+	LINKLIST_FOREACH(Palette *, palette, &bmain_->palettes) {
 		build_palette(palette);
 	}
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc
index a0b2f89ea9d..4ea0b371062 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene_layer.cc
@@ -115,7 +115,7 @@ void DepsgraphRelationBuilder::build_scene_layer(Scene *scene, SceneLayer *scene
 	}
 
 	/* Palettes. */
-	LINKLIST_FOREACH(Palette *, palette, &bmain->palettes) {
+	LINKLIST_FOREACH(Palette *, palette, &bmain_->palettes) {
 		build_palette(palette);
 	}
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 11915c7d314..5bce8f5c745 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1837,7 +1837,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 			DRW_shgroup_empty(stl, psl, ob, scene_layer);
 			break;
 		case OB_GPENCIL:
-			DRW_shgroup_gpencil(stl, ob, sl);
+			DRW_shgroup_gpencil(stl, ob, scene_layer);
 			break;
 		case OB_SPEAKER:
 			DRW_shgroup_speaker(stl, ob, scene_layer);
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index bc6263d5691..2c96943874b 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1533,7 +1533,7 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p)
 							ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);  /* freedata, and undo */
 						
 						sl->basact = base;
-						ED_base_object_activate(C, base);
+						ED_object_base_activate(C, base);
 					}
 					else {
 						printf("ERROR: Couldn't find base for active gp_object (sl = %p, obact = %s)\n", sl, obact->id.name);
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c b/source/blender/modifiers/intern/MOD_gpencillattice.c
index b993dab082f..fa0e24f5bdf 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);
+			BKE_scene_graph_update_for_newframe(&eval_ctx_copy, depsgraph, bmain, scene, scene_layer);
 			
 			/* 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);
+	BKE_scene_graph_update_for_newframe(&eval_ctx_copy, depsgraph, bmain, scene, scene_layer);
 }
 
 static void freeData(ModifierData *md)