diff options
Diffstat (limited to 'source/blender/editors')
5 files changed, 11 insertions, 9 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, 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; diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 150abaa19a9..ec294ed4298 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -935,7 +935,7 @@ 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++) { - if (!U.experimental.use_new_particle_system && + if (!U.experimental.use_new_geometry_nodes && STREQ(item_iter->identifier, "GeometryNodeTree")) { continue; } |