Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00
parent 297bf7235b 75fc1c3507
commit bfe1d0e0dc
801 changed files with 1530 additions and 1530 deletions
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -21,7 +21,7 @@
 * The Original Code is: all of this file.
 *
 * Contributor(s): none yet.
- * 
+ *
 * ***** END GPL LICENSE BLOCK *****
 */