Merge branch 'master' into blender2.8

 Conflicts:
	source/blender/editors/animation/anim_deps.c
	source/blender/editors/animation/keyframing.c
	source/blender/editors/animation/keyingsets.c
	source/blender/editors/armature/pose_edit.c
	source/blender/editors/armature/pose_transform.c
	source/blender/editors/gpencil/gpencil_convert.c
	source/blender/editors/include/ED_anim_api.h
	source/blender/editors/include/ED_keyframing.h
	source/blender/editors/interface/interface_anim.c
	source/blender/editors/space_action/action_edit.c
	source/blender/editors/space_graph/graph_edit.c
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/makesrna/intern/rna_armature.c
	source/blender/makesrna/intern/rna_pose.c
	source/blender/python/intern/bpy_rna_anim.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
	source/gameengine/Converter/KX_BlenderSceneConverter.cpp

1 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index cfdbe87c8a1..adb5a10c19d 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -46,10 +46,10 @@
 
 #include "BKE_animsys.h"
 #include "BKE_action.h"
+#include "BKE_context.h"
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
-#include "BKE_context.h"
-#include "BKE_global.h"
+#include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h"
 
@@ -64,7 +64,7 @@
 /* tags the given anim list element for refreshes (if applicable)
  * due to Animation Editor editing
  */
-void ANIM_list_elem_update(Scene *scene, bAnimListElem *ale)
+void ANIM_list_elem_update(Main *bmain, Scene *scene, bAnimListElem *ale)
 {
 	ID *id;
 	FCurve *fcu;
@@ -97,7 +97,7 @@ void ANIM_list_elem_update(Scene *scene, bAnimListElem *ale)
 		RNA_id_pointer_create(id, &id_ptr);
 
 		if (RNA_path_resolve_property(&id_ptr, fcu->rna_path, &ptr, &prop))
-			RNA_property_update_main(G.main, scene, &ptr, prop);
+			RNA_property_update_main(bmain, scene, &ptr, prop);
 	}
 	else {
 		/* in other case we do standard depsgraph update, ideally
@@ -406,7 +406,7 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
 
 			if (ale->update & ANIM_UPDATE_DEPS) {
 				ale->update &= ~ANIM_UPDATE_DEPS;
-				ANIM_list_elem_update(ac->scene, ale);
+				ANIM_list_elem_update(ac->bmain, ac->scene, ale);
 			}
 		}
 		else if (ale->datatype == ALE_FCURVE) {
@@ -426,13 +426,13 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
 
 			if (ale->update & ANIM_UPDATE_DEPS) {
 				ale->update &= ~ANIM_UPDATE_DEPS;
-				ANIM_list_elem_update(ac->scene, ale);
+				ANIM_list_elem_update(ac->bmain, ac->scene, ale);
 			}
 		}
 		else if (ale->datatype == ALE_NLASTRIP) {
 			if (ale->update & ANIM_UPDATE_DEPS) {
 				ale->update &= ~ANIM_UPDATE_DEPS;
-				ANIM_list_elem_update(ac->scene, ale);
+				ANIM_list_elem_update(ac->bmain, ac->scene, ale);
 			}
 		}