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/object | |
| 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/object')
| -rw-r--r-- | source/blender/editors/object/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_add.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index a1f8061c9f7..2f72f563e68 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -87,7 +87,8 @@ if(WITH_INTERNATIONAL) 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/object/object_add.c b/source/blender/editors/object/object_add.c index eb2f5f8ca51..36e780f7472 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1713,7 +1713,7 @@ void OBJECT_OT_hair_add(wmOperatorType *ot) static bool object_pointcloud_add_poll(bContext *C) { - if (!U.experimental.use_new_particle_system) { + if (!U.experimental.use_new_point_cloud_type) { return false; } return ED_operator_objectmode(C); @@ -2318,7 +2318,7 @@ static const EnumPropertyItem convert_target_items[] = { "MESH", ICON_OUTLINER_OB_MESH, "Mesh", -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_POINT_CLOUD "Mesh from Curve, Surface, Metaball, Text, or Pointcloud objects"}, #else "Mesh from Curve, Surface, Metaball, or Text objects"}, @@ -2328,7 +2328,7 @@ static const EnumPropertyItem convert_target_items[] = { ICON_OUTLINER_OB_GREASEPENCIL, "Grease Pencil", "Grease Pencil from Curve or Mesh objects"}, -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_POINT_CLOUD {OB_POINTCLOUD, "POINTCLOUD", ICON_OUTLINER_OB_POINTCLOUD, |