Merge branch 'master' into blender2.8

2018-05-27 11:06:29 +02:00
parent 474971f3d8 bc3727a943
commit 9a74b60367
69 changed files with 1864 additions and 375 deletions
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@ -136,6 +136,7 @@ void register_node_type_sh_tex_musgrave(void);
 void register_node_type_sh_tex_noise(void);
 void register_node_type_sh_tex_checker(void);
 void register_node_type_sh_bump(void);
+void register_node_type_sh_tex_ies(void);

 #endif