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/editors/lattice/editlattice_tools.c
+++ b/source/blender/editors/lattice/editlattice_tools.c
@@ -56,7 +56,7 @@
 /** \name Make Regular Operator
 * \{ */

-static int make_regular_poll(bContext *C)
+static bool make_regular_poll(bContext *C)
 {
 	Object *ob;