Merge branch 'master' into blender2.8

 Conflicts:
	source/blender/collada/ArmatureExporter.cpp
	source/blender/collada/ArmatureExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentExporter.h
	source/blender/collada/SceneExporter.cpp
	source/blender/collada/SceneExporter.h
	source/blender/collada/collada.cpp
	source/blender/collada/collada.h
	source/blender/editors/armature/armature_edit.c
	source/blender/editors/armature/editarmature_retarget.c
	source/blender/editors/armature/pose_transform.c
	source/blender/editors/include/ED_armature.h
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_screen.h
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/screen/screen_edit.c
	source/blender/editors/screen/screen_ops.c
	source/blender/windowmanager/intern/wm.c
	source/blender/windowmanager/intern/wm_files.c
	source/blender/windowmanager/intern/wm_window.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/collada/SceneExporter.h b/source/blender/collada/SceneExporter.h
index c330aa81e91..24a2dcf08c8 100644
--- a/source/blender/collada/SceneExporter.h
+++ b/source/blender/collada/SceneExporter.h
@@ -96,12 +96,12 @@ class SceneExporter: COLLADASW::LibraryVisualScenes, protected TransformWriter,
 {
 public:
 	SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings);
-	void exportScene(Depsgraph *depsgraph, Scene *sce);
+	void exportScene(bContext *C, Depsgraph *depsgraph, Scene *sce);
 
 private:
 	friend class ArmatureExporter;
-	void exportHierarchy(struct Depsgraph *depsgraph, Scene *sce);
-	void writeNodes(struct Depsgraph *depsgraph, Object *ob, Scene *sce);
+	void exportHierarchy(bContext *C, struct Depsgraph *depsgraph, Scene *sce);
+	void writeNodes(bContext *C, struct Depsgraph *depsgraph, Object *ob, Scene *sce);
 	
 	ArmatureExporter *arm_exporter;
 	const ExportSettings *export_settings;