diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-06-23 12:30:46 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-06-23 12:30:46 +0300 |
| commit | 87ceff3d1b5805658622a314a84620b52ab98c7d (patch) | |
| tree | 2882dc9758301be185e712cfaece6d98091a17d7 /source/blender/editors/space_node | |
| parent | 13a5b954c350518cf21c9beb97e2e160f7372a9b (diff) | |
Preferences: New experimental settings for particle system and hair
This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and
`WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings:
* `use_new_particle_system`: Enables the point cloud type and the simulation editor.
* `use_new_hair_type`: Only displays the add-operator in the add menu for now.
Note, in the current state you can't do anything productive with the new particle
system or the new hair type. Features will be added step by step in the upcoming
weeks and months.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D8096
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 4e21cdc9d16..f8c30f9a688 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -75,10 +75,6 @@ if(WITH_OPENIMAGEDENOISE) add_definitions(-DWITH_OPENIMAGEDENOISE) endif() -if (WITH_NEW_SIMULATION_TYPE) - add_definitions(-DWITH_NEW_SIMULATION_TYPE) -endif() - add_definitions(${GL_DEFINITIONS}) blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index f339d11b842..562aa6b078c 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -936,11 +936,10 @@ static void node_space_subtype_item_extend(bContext *C, EnumPropertyItem **item, bool free; const EnumPropertyItem *item_src = RNA_enum_node_tree_types_itemf_impl(C, &free); for (const EnumPropertyItem *item_iter = item_src; item_iter->identifier; item_iter++) { -#ifndef WITH_NEW_SIMULATION_TYPE - if (STREQ(item_iter->identifier, "SimulationNodeTree")) { + if (!U.experimental.use_new_particle_system && + STREQ(item_iter->identifier, "SimulationNodeTree")) { continue; } -#endif RNA_enum_item_add(item, totitem, item_iter); } if (free) { |