Merge branch 'master' into blender2.8

2017-08-12 00:23:49 +10:00
parent d9323a537f e6da7bb75c
commit 9567529b8f
41 changed files with 480 additions and 197 deletions
--- a/source/blender/python/intern/bpy_manipulator_wrap.c
+++ b/source/blender/python/intern/bpy_manipulator_wrap.c
@@ -130,7 +130,7 @@ static void manipulator_properties_init(wmManipulatorType *wt)
 	/* only call this so pyrna_deferred_register_class gives a useful error
 	 * WM_operatortype_append_ptr will call RNA_def_struct_identifier
 	 * later */
-	RNA_def_struct_identifier(wt->srna, wt->idname);
+	RNA_def_struct_identifier(&BLENDER_RNA, wt->srna, wt->idname);

 	if (pyrna_deferred_register_class(wt->srna, py_class) != 0) {
 		PyErr_Print(); /* failed to register operator props */