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/editors/space_buttons | |
| 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/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index ce0787dbdb9..c71e5e49d8d 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -50,7 +50,8 @@ if(WITH_FREESTYLE) 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/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index dcf2e6e74fa..0d1efcab125 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -244,7 +244,7 @@ static bool buttons_context_path_data(ButsContextPath *path, int type) return true; } #endif -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_POINT_CLOUD if (RNA_struct_is_a(ptr->type, &RNA_PointCloud) && (type == -1 || type == OB_POINTCLOUD)) { return true; } @@ -773,7 +773,7 @@ const char *buttons_context_dir[] = { #ifdef WITH_HAIR_NODES "hair", #endif -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_POINT_CLOUD "pointcloud", #endif "volume", @@ -862,7 +862,7 @@ int /*eContextResult*/ buttons_context(const bContext *C, return CTX_RESULT_OK; } #endif -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_POINT_CLOUD if (CTX_data_equals(member, "pointcloud")) { set_pointer_type(path, result, &RNA_PointCloud); return CTX_RESULT_OK; |