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/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -87,7 +87,7 @@ struct bNodeInstanceHash;

 /** Compact definition of a node socket.
 * Can be used to quickly define a list of static sockets for a node,
- * which are added to each new node of that type. 
+ * which are added to each new node of that type.
 *
 * \deprecated This struct is used by C nodes to define templates as simple
 * static struct lists. These are converted to the new template collections