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

[Jacques Lucke]

Commit: edd0928d09c1f5e8aff662916c05806348ecaa82
Author: Jacques Lucke
Date:   Thu Mar 19 11:19:05 2020 +0100
Branches: functions
https://developer.blender.org/rBedd0928d09c1f5e8aff662916c05806348ecaa82

Merge branch 'master' into functions

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 510621ee4d4,7fd5470cecc..d18f53ec3fc
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -243,7 -241,8 +245,9 @@@ set(SR
    intern/tracking_util.c
    intern/undo_system.c
    intern/unit.c
 +  intern/virtual_node_tree.cc
+   intern/volume.cc
+   intern/volume_render.cc
    intern/workspace.c
    intern/world.c
    intern/writeavi.c
@@@ -304,11 -304,8 +309,10 @@@
    BKE_icons.h
    BKE_idcode.h
    BKE_idprop.h
 +  BKE_id_data_cache.h
 +  BKE_id_handle.h
    BKE_idtype.h
    BKE_image.h
-   BKE_image_save.h
    BKE_ipo.h
    BKE_kelvinlet.h
    BKE_key.h
@@@ -378,7 -375,8 +383,9 @@@
    BKE_tracking.h
    BKE_undo_system.h
    BKE_unit.h
 +  BKE_virtual_node_tree.h
+   BKE_volume.h
+   BKE_volume_render.h
    BKE_workspace.h
    BKE_world.h
    BKE_writeavi.h
diff --cc source/creator/creator.c
index b4e4c12f221,a6c0e50e527..6f1266ec21e
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@@ -376,8 -375,8 +377,9 @@@ int main(int argc
    BKE_modifier_init();
    BKE_gpencil_modifier_init();
    BKE_shaderfx_init();
+   BKE_volumes_init();
    DEG_register_node_types();
 +  FN_initialize();
  
    BKE_brush_system_init();
    RE_texture_rng_init();