[Bf-blender-cvs] [d69ac37f851] greasepencil-object: Fixes after merge

[Antonio Vazquez]

Commit: d69ac37f85182839fee746489b619e1626a2f4b3
Author: Antonio Vazquez
Date:   Tue Jun 12 12:49:15 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd69ac37f85182839fee746489b619e1626a2f4b3

Fixes after merge

Some parameter list change.

Also disabled some functions that will not be used in annotations. Keep the function as reference to be removed when annotation will be back.

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

M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/gpencil/gpencil_data.c

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

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 26727ce77b7..4fc00d34536 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1152,7 +1152,7 @@ void BKE_animdata_main_cb(Main *bmain, ID_AnimData_Edit_Callback func, void *use
 	ANIMDATA_IDS_CB(bmain->gpencil.first);
 
 	/* palettes */
-	ANIMDATA_IDS_CB(mainptr->palettes.first);
+	ANIMDATA_IDS_CB(bmain->palettes.first);
 
 	/* cache files */
 	ANIMDATA_IDS_CB(bmain->cachefiles.first);
@@ -1248,7 +1248,7 @@ void BKE_animdata_fix_paths_rename_all(ID *ref_id, const char *prefix, const cha
 	RENAMEFIX_ANIM_IDS(bmain->gpencil.first);
 
 	/* palettes */
-	RENAMEFIX_ANIM_IDS(mainptr->palettes.first);
+	RENAMEFIX_ANIM_IDS(bmain->palettes.first);
 
 	/* cache files */
 	RENAMEFIX_ANIM_IDS(bmain->cachefiles.first);
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index b8fbdc45018..b21cbc554cc 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -583,6 +583,7 @@ static void gp_add_filldata_tobuffer(
 	immVertex3fv(pos, fpt); /* position */
 }
 
+#if 0 /* GPXX disabled, not used in annotations */
 /* assign image texture for filling stroke */
 static int gp_set_filling_texture(Image *image, short flag)
 {
@@ -618,6 +619,7 @@ static int gp_set_filling_texture(Image *image, short flag)
 
 	return error;
 }
+#endif
 
 /* draw fills for shapes */
 static void gp_draw_stroke_fill(
@@ -656,11 +658,12 @@ static void gp_draw_stroke_fill(
 	immUniform1f("texture_opacity", gp_style->texture_opacity);
 	immUniform1i("t_mix", gp_style->flag & GP_STYLE_COLOR_TEX_MIX ? 1 : 0);
 	immUniform1i("t_flip", gp_style->flag & GP_STYLE_COLOR_FLIP_FILL ? 1 : 0);
+#if 0 /* GPXX disabled, not used in annotations */
 	/* image texture */
 	if ((gp_style->fill_style == GP_STYLE_FILL_STYLE_TEXTURE) || (gp_style->flag & GP_STYLE_COLOR_TEX_MIX)) {
 		gp_set_filling_texture(gp_style->ima, gp_style->flag);
 	}
-
+#endif
 	/* Draw all triangles for filling the polygon (cache must be calculated before) */
 	immBegin(GWN_PRIM_TRIS, gps->tot_triangles * 3);
 	/* TODO: use batch instead of immediate mode, to share vertices */
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 431aa5f1126..96678cb3928 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1926,7 +1926,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op)
 					}
 					else {
 						/* merge in data - we'll fix the drivers manually */
-						BKE_animdata_merge_copy(&obact->id, &base->object->id, ADT_MERGECOPY_KEEP_DST, false);
+						BKE_animdata_merge_copy(bmain, &obact->id, &base->object->id, ADT_MERGECOPY_KEEP_DST, false);
 					}
 				}
 
@@ -1937,7 +1937,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op)
 					}
 					else {
 						/* merge in data - we'll fix the drivers manually */
-						BKE_animdata_merge_copy(&gpd_dst->id, &gpd_src->id, ADT_MERGECOPY_KEEP_DST, false);
+						BKE_animdata_merge_copy(bmain, &gpd_dst->id, &gpd_src->id, ADT_MERGECOPY_KEEP_DST, false);
 					}
 				}
 			}