Merge branch 'master' into blender2.8

2018-07-02 12:03:56 +02:00
parent ad5a20efce b88e51dd55
commit b076b3853c
190 changed files with 611 additions and 606 deletions
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1930,7 +1930,7 @@ static int wm_revert_mainfile_exec(bContext *C, wmOperator *op)
 	}
 }

-static int wm_revert_mainfile_poll(bContext *UNUSED(C))
+static bool wm_revert_mainfile_poll(bContext *UNUSED(C))
 {
 	return G.relbase_valid;
 }