Differential D5343 Diff 16622 source/blender/editors/gpencil/gpencil_data.c

Changeset View

Standalone View

Show First 20 Lines • Show All 2,195 Lines • ▼ Show 20 Lines	static void joined_gpencil_fix_animdata_cb(ID id, FCurve fcu, void *user_data)
}		}
}		}

/* join objects called from OBJECT_OT_join */		/* join objects called from OBJECT_OT_join */
int ED_gpencil_join_objects_exec(bContext C, wmOperator op)		int ED_gpencil_join_objects_exec(bContext C, wmOperator op)
{		{
Main *bmain = CTX_data_main(C);		Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);		Scene *scene = CTX_data_scene(C);
Depsgraph *depsgraph = CTX_data_depsgraph(C);		Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Object *ob_active = CTX_data_active_object(C);		Object *ob_active = CTX_data_active_object(C);
bGPdata *gpd_dst = NULL;		bGPdata *gpd_dst = NULL;
bool ok = false;		bool ok = false;

/* Ensure we're in right mode and that the active object is correct */		/* Ensure we're in right mode and that the active object is correct */
if (!ob_active \|\| ob_active->type != OB_GPENCIL) {		if (!ob_active \|\| ob_active->type != OB_GPENCIL) {
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}
▲ Show 20 Lines • Show All 745 Lines • Show Last 20 Lines