[Bf-blender-cvs] [4f8b24e0c5e] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 4f8b24e0c5e0bf54b0769d1b12393f809a84b120
Author: Jacques Lucke
Date:   Mon Mar 9 15:27:27 2020 +0100
Branches: functions
https://developer.blender.org/rB4f8b24e0c5e0bf54b0769d1b12393f809a84b120

Merge branch 'master' into functions

===================================================================



===================================================================

diff --cc source/blender/CMakeLists.txt
index 22ed2eff2a9,b44b6db8804..433ccf39a0e
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@@ -112,8 -112,7 +112,9 @@@ add_subdirectory(nodes
  add_subdirectory(modifiers)
  add_subdirectory(gpencil_modifiers)
  add_subdirectory(shader_fx)
 +add_subdirectory(functions)
 +add_subdirectory(simulations)
+ add_subdirectory(io)
  add_subdirectory(makesdna)
  add_subdirectory(makesrna)