diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-10-21 14:47:50 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-10-21 14:47:50 +0300 |
| commit | 8738a668d8209b41e7554b3711213b43800b3bd4 (patch) | |
| tree | 2a49295639b7f6cb473039d95f980c23b6bdc993 /source/blender/modifiers | |
| parent | 819b1a7f9da05cc49c8cbe56a98886ed58bbc31c (diff) | |
Preferences: separate feature flags for geometry nodes and point cloud type
Those two features are not directly related and one might be activated
in master earlier than the other.
WITH_PARTICLE_NODES was removed, because we continue the project
under the name "Geometry Nodes".
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_simulation.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 754a7eefee7..65024e46a2b 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -195,7 +195,8 @@ if(WITH_OPENVDB) endif() if(WITH_EXPERIMENTAL_FEATURES) - add_definitions(-DWITH_PARTICLE_NODES) + add_definitions(-DWITH_GEOMETRY_NODES) + add_definitions(-DWITH_POINT_CLOUD) add_definitions(-DWITH_HAIR_NODES) endif() diff --git a/source/blender/modifiers/intern/MOD_simulation.cc b/source/blender/modifiers/intern/MOD_simulation.cc index 28b4c329730..10a4b3f7cf9 100644 --- a/source/blender/modifiers/intern/MOD_simulation.cc +++ b/source/blender/modifiers/intern/MOD_simulation.cc @@ -158,7 +158,7 @@ ModifierTypeInfo modifierType_Simulation = { /* name */ "Simulation", /* structName */ "SimulationModifierData", /* structSize */ sizeof(SimulationModifierData), -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_GEOMETRY_NODES /* srna */ &RNA_SimulationModifier, #else /* srna */ &RNA_Modifier, |