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, 5 insertions, 4 deletions

diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 7687bd476b9..31e8685e323 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -304,7 +304,7 @@ static int return_editcurve_indexar(
 	return totvert;
 }
 
-static bool object_hook_index_array(Scene *scene, Object *obedit,
+static bool object_hook_index_array(Main *bmain, Scene *scene, Object *obedit,
                                     int *r_tot, int **r_indexar, char *r_name, float r_cent[3])
 {
 	*r_indexar = NULL;
@@ -336,7 +336,7 @@ static bool object_hook_index_array(Scene *scene, Object *obedit,
 		}
 		case OB_CURVE:
 		case OB_SURF:
-			ED_curve_editnurb_load(obedit);
+			ED_curve_editnurb_load(bmain, obedit);
 			ED_curve_editnurb_make(obedit);
 			return return_editcurve_indexar(obedit, r_tot, r_indexar, r_cent);
 		case OB_LATTICE:
@@ -476,7 +476,7 @@ static int add_hook_object(const bContext *C, Main *bmain, Scene *scene, ViewLay
 	int tot, ok, *indexar;
 	char name[MAX_NAME];
 
-	ok = object_hook_index_array(scene, obedit, &tot, &indexar, name, cent);
+	ok = object_hook_index_array(bmain, scene, obedit, &tot, &indexar, name, cent);
 
 	if (!ok) {
 		BKE_report(reports, RPT_ERROR, "Requires selected vertices or active vertex group");
@@ -814,6 +814,7 @@ void OBJECT_OT_hook_recenter(wmOperatorType *ot)
 
 static int object_hook_assign_exec(bContext *C, wmOperator *op)
 {
+	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_HookModifier);
 	int num = RNA_enum_get(op->ptr, "modifier");
@@ -831,7 +832,7 @@ static int object_hook_assign_exec(bContext *C, wmOperator *op)
 
 	/* assign functionality */
 
-	if (!object_hook_index_array(scene, ob, &tot, &indexar, name, cent)) {
+	if (!object_hook_index_array(bmain, scene, ob, &tot, &indexar, name, cent)) {
 		BKE_report(op->reports, RPT_WARNING, "Requires selected vertices or active vertex group");
 		return OPERATOR_CANCELLED;
 	}