[Bf-blender-cvs] [d2c4af98657] geometry-nodes: Merge branch 'master' into geometry-nodes

[Jacques Lucke]

Commit: d2c4af98657e8a6cd7d3486ab000b555b9cda4b4
Author: Jacques Lucke
Date:   Mon Nov 9 12:44:45 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBd2c4af98657e8a6cd7d3486ab000b555b9cda4b4

Merge branch 'master' into geometry-nodes

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index bceb3cc0021,2c10dd446f1..fca6079ceb6
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -152,13 -89,6 +89,7 @@@
  #include "BKE_report.h"
  #include "BKE_scene.h"
  #include "BKE_screen.h"
- #include "BKE_shader_fx.h"
- #include "BKE_sound.h"
- #include "BKE_volume.h"
++
  #include "BKE_workspace.h"
  
  #include "DRW_engine.h"
diff --cc source/blender/modifiers/CMakeLists.txt
index ea4041c9c3c,549751ce267..34713392afb
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@@ -29,11 -29,9 +29,11 @@@ set(IN
    ../bmesh
    ../depsgraph
    ../editors/include
 +  ../functions
    ../makesdna
    ../makesrna
 +  ../nodes
-   ../render/extern/include
+   ../render
    ../windowmanager
    ../../../intern/eigen
    ../../../intern/guardedalloc
diff --cc source/blender/nodes/geometry/nodes/node_geo_common.cc
index ee3045b9b35,fd26d450129..8adc3962698
--- a/source/blender/nodes/geometry/nodes/node_geo_common.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_common.cc
@@@ -32,11 -32,11 +32,11 @@@ void register_node_type_geo_group(void
    ntype.poll_instance = node_group_poll_instance;
    ntype.insert_link = node_insert_link_default;
    ntype.update_internal_links = node_update_internal_links_default;
 -  ntype.rna_ext.srna = RNA_struct_find("SimulationNodeGroup");
 +  ntype.rna_ext.srna = RNA_struct_find("GeometryNodeGroup");
-   BLI_assert(ntype.rna_ext.srna != NULL);
+   BLI_assert(ntype.rna_ext.srna != nullptr);
    RNA_struct_blender_type_set(ntype.rna_ext.srna, &ntype);
  
-   node_type_socket_templates(&ntype, NULL, NULL);
+   node_type_socket_templates(&ntype, nullptr, nullptr);
    node_type_size(&ntype, 140, 60, 400);
    node_type_label(&ntype, node_group_label);
    node_type_group_update(&ntype, node_group_update);