Cleanup: remove all of "#ifdef WITH_POINT_CLOUD"
Since Point Cloud was removed from experimental this is no longer needed.
This commit is contained in:
parent
3d3a20d6d1
commit
ea74ed5a7a
Notes:
blender-bot
2023-02-14 05:52:32 +01:00
Referenced by commit 82645ff739
, Move Point Cloud object back to Experimental Features
|
@ -88,7 +88,6 @@ endif()
|
|||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_GEOMETRY_NODES)
|
||||
add_definitions(-DWITH_POINT_CLOUD)
|
||||
add_definitions(-DWITH_HAIR_NODES)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -2315,23 +2315,17 @@ static const EnumPropertyItem convert_target_items[] = {
|
|||
"MESH",
|
||||
ICON_OUTLINER_OB_MESH,
|
||||
"Mesh",
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
"Mesh from Curve, Surface, Metaball, Text, or Pointcloud objects"},
|
||||
#else
|
||||
"Mesh from Curve, Surface, Metaball, or Text objects"},
|
||||
#endif
|
||||
{OB_GPENCIL,
|
||||
"GPENCIL",
|
||||
ICON_OUTLINER_OB_GREASEPENCIL,
|
||||
"Grease Pencil",
|
||||
"Grease Pencil from Curve or Mesh objects"},
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
{OB_POINTCLOUD,
|
||||
"POINTCLOUD",
|
||||
ICON_OUTLINER_OB_POINTCLOUD,
|
||||
"Pointcloud",
|
||||
"Pointcloud from Mesh objects"},
|
||||
#endif
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
|
||||
|
|
|
@ -51,7 +51,6 @@ endif()
|
|||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_GEOMETRY_NODES)
|
||||
add_definitions(-DWITH_POINT_CLOUD)
|
||||
add_definitions(-DWITH_HAIR_NODES)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -246,11 +246,9 @@ static bool buttons_context_path_data(ButsContextPath *path, int type)
|
|||
return true;
|
||||
}
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
if (RNA_struct_is_a(ptr->type, &RNA_PointCloud) && (type == -1 || type == OB_POINTCLOUD)) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
if (RNA_struct_is_a(ptr->type, &RNA_Volume) && (type == -1 || type == OB_VOLUME)) {
|
||||
return true;
|
||||
}
|
||||
|
@ -814,9 +812,7 @@ const char *buttons_context_dir[] = {
|
|||
#ifdef WITH_HAIR_NODES
|
||||
"hair",
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
"pointcloud",
|
||||
#endif
|
||||
"volume",
|
||||
NULL,
|
||||
};
|
||||
|
@ -903,12 +899,10 @@ int /*eContextResult*/ buttons_context(const bContext *C,
|
|||
return CTX_RESULT_OK;
|
||||
}
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
if (CTX_data_equals(member, "pointcloud")) {
|
||||
set_pointer_type(path, result, &RNA_PointCloud);
|
||||
return CTX_RESULT_OK;
|
||||
}
|
||||
#endif
|
||||
if (CTX_data_equals(member, "volume")) {
|
||||
set_pointer_type(path, result, &RNA_Volume);
|
||||
return CTX_RESULT_OK;
|
||||
|
|
|
@ -99,7 +99,6 @@ set(DEFSRC
|
|||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_GEOMETRY_NODES)
|
||||
add_definitions(-DWITH_POINT_CLOUD)
|
||||
add_definitions(-DWITH_HAIR_NODES)
|
||||
list(APPEND DEFSRC
|
||||
rna_hair.c
|
||||
|
|
|
@ -4308,9 +4308,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
|
|||
{"rna_packedfile.c", NULL, RNA_def_packedfile},
|
||||
{"rna_palette.c", NULL, RNA_def_palette},
|
||||
{"rna_particle.c", NULL, RNA_def_particle},
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
{"rna_pointcloud.c", NULL, RNA_def_pointcloud},
|
||||
#endif
|
||||
{"rna_pose.c", "rna_pose_api.c", RNA_def_pose},
|
||||
{"rna_curveprofile.c", NULL, RNA_def_profile},
|
||||
{"rna_lightprobe.c", NULL, RNA_def_lightprobe},
|
||||
|
|
|
@ -289,11 +289,9 @@ short RNA_type_to_ID_code(const StructRNA *type)
|
|||
if (base_type == &RNA_PaintCurve) {
|
||||
return ID_PC;
|
||||
}
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
if (base_type == &RNA_PointCloud) {
|
||||
return ID_PT;
|
||||
}
|
||||
# endif
|
||||
if (base_type == &RNA_LightProbe) {
|
||||
return ID_LP;
|
||||
}
|
||||
|
@ -399,11 +397,7 @@ StructRNA *ID_code_to_RNA_type(short idcode)
|
|||
case ID_PC:
|
||||
return &RNA_PaintCurve;
|
||||
case ID_PT:
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
return &RNA_PointCloud;
|
||||
# else
|
||||
return &RNA_ID;
|
||||
# endif
|
||||
case ID_LP:
|
||||
return &RNA_LightProbe;
|
||||
case ID_SCE:
|
||||
|
|
|
@ -466,9 +466,7 @@ void RNA_def_main_lightprobes(BlenderRNA *brna, PropertyRNA *cprop);
|
|||
#ifdef WITH_HAIR_NODES
|
||||
void RNA_def_main_hairs(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
void RNA_def_main_pointclouds(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
#endif
|
||||
void RNA_def_main_volumes(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
#ifdef WITH_GEOMETRY_NODES
|
||||
void RNA_def_main_simulations(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
|
|
|
@ -128,9 +128,7 @@ RNA_MAIN_LISTBASE_FUNCS_DEF(objects)
|
|||
RNA_MAIN_LISTBASE_FUNCS_DEF(paintcurves)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(palettes)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(particles)
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(pointclouds)
|
||||
# endif
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(scenes)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(screens)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(shapekeys)
|
||||
|
@ -393,14 +391,12 @@ void RNA_def_main(BlenderRNA *brna)
|
|||
# ifdef WITH_HAIR_NODES
|
||||
{"hairs", "Hair", "rna_Main_hairs_begin", "Hairs", "Hair data-blocks", RNA_def_main_hairs},
|
||||
# endif
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
{"pointclouds",
|
||||
"PointCloud",
|
||||
"rna_Main_pointclouds_begin",
|
||||
"Point Clouds",
|
||||
"Point cloud data-blocks",
|
||||
RNA_def_main_pointclouds},
|
||||
# endif
|
||||
{"volumes",
|
||||
"Volume",
|
||||
"rna_Main_volumes_begin",
|
||||
|
|
|
@ -678,7 +678,6 @@ static Hair *rna_Main_hairs_new(Main *bmain, const char *name)
|
|||
}
|
||||
# endif
|
||||
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
static PointCloud *rna_Main_pointclouds_new(Main *bmain, const char *name)
|
||||
{
|
||||
char safe_name[MAX_ID_NAME - 2];
|
||||
|
@ -688,7 +687,6 @@ static PointCloud *rna_Main_pointclouds_new(Main *bmain, const char *name)
|
|||
id_us_min(&pointcloud->id);
|
||||
return pointcloud;
|
||||
}
|
||||
# endif
|
||||
|
||||
static Volume *rna_Main_volumes_new(Main *bmain, const char *name)
|
||||
{
|
||||
|
@ -757,9 +755,7 @@ RNA_MAIN_ID_TAG_FUNCS_DEF(lightprobes, lightprobes, ID_LP)
|
|||
# ifdef WITH_HAIR_NODES
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(hairs, hairs, ID_HA)
|
||||
# endif
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(pointclouds, pointclouds, ID_PT)
|
||||
# endif
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(volumes, volumes, ID_VO)
|
||||
# ifdef WITH_GEOMETRY_NODES
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(simulations, simulations, ID_SIM)
|
||||
|
@ -2210,7 +2206,6 @@ void RNA_def_main_hairs(BlenderRNA *brna, PropertyRNA *cprop)
|
|||
}
|
||||
# endif
|
||||
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
void RNA_def_main_pointclouds(BlenderRNA *brna, PropertyRNA *cprop)
|
||||
{
|
||||
StructRNA *srna;
|
||||
|
@ -2257,7 +2252,6 @@ void RNA_def_main_pointclouds(BlenderRNA *brna, PropertyRNA *cprop)
|
|||
parm = RNA_def_boolean(func, "value", 0, "Value", "");
|
||||
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
||||
}
|
||||
# endif
|
||||
|
||||
void RNA_def_main_volumes(BlenderRNA *brna, PropertyRNA *cprop)
|
||||
{
|
||||
|
|
|
@ -579,11 +579,7 @@ static StructRNA *rna_Object_data_typef(PointerRNA *ptr)
|
|||
return &RNA_ID;
|
||||
# endif
|
||||
case OB_POINTCLOUD:
|
||||
# ifdef WITH_POINT_CLOUD
|
||||
return &RNA_PointCloud;
|
||||
# else
|
||||
return &RNA_ID;
|
||||
# endif
|
||||
case OB_VOLUME:
|
||||
return &RNA_Volume;
|
||||
default:
|
||||
|
|
|
@ -199,7 +199,6 @@ endif()
|
|||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_GEOMETRY_NODES)
|
||||
add_definitions(-DWITH_POINT_CLOUD)
|
||||
add_definitions(-DWITH_HAIR_NODES)
|
||||
endif()
|
||||
|
||||
|
|
Loading…
Reference in New Issue