Cleanup: Remove compile option for curves object
After becb1530b1
the new curves object type isn't hidden
behind an experimental flag anymore, and other areas depend on this,
so disabling curves at compile time doesn't make sense anymore.
This commit is contained in:
parent
16b145bc62
commit
597955d0a8
|
@ -128,10 +128,6 @@ if(WITH_OPENIMAGEDENOISE)
|
|||
)
|
||||
endif()
|
||||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_NEW_CURVES_TYPE)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
||||
add_dependencies(bf_intern_cycles bf_rna)
|
||||
|
|
|
@ -613,8 +613,6 @@ void BlenderSync::sync_particle_hair(
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
|
||||
static std::optional<BL::FloatAttribute> find_curves_radius_attribute(BL::Curves b_curves)
|
||||
{
|
||||
for (BL::Attribute &b_attribute : b_curves.attributes) {
|
||||
|
@ -990,15 +988,6 @@ void BlenderSync::sync_hair(Hair *hair, BObjectInfo &b_ob_info, bool motion, int
|
|||
export_hair_curves(scene, hair, b_curves, need_motion, motion_scale);
|
||||
}
|
||||
}
|
||||
#else
|
||||
void BlenderSync::sync_hair(Hair *hair, BObjectInfo &b_ob_info, bool motion, int motion_step)
|
||||
{
|
||||
(void)hair;
|
||||
(void)b_ob_info;
|
||||
(void)motion;
|
||||
(void)motion_step;
|
||||
}
|
||||
#endif
|
||||
|
||||
void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, Hair *hair)
|
||||
{
|
||||
|
@ -1010,14 +999,11 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, H
|
|||
new_hair.set_used_shaders(used_shaders);
|
||||
|
||||
if (view_layer.use_hair) {
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
if (b_ob_info.object_data.is_a(&RNA_Curves)) {
|
||||
/* Hair object. */
|
||||
sync_hair(&new_hair, b_ob_info, false);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
else {
|
||||
/* Particle hair. */
|
||||
bool need_undeformed = new_hair.need_attribute(scene, ATTR_STD_GENERATED);
|
||||
BL::Mesh b_mesh = object_to_mesh(
|
||||
|
@ -1064,15 +1050,12 @@ void BlenderSync::sync_hair_motion(BL::Depsgraph b_depsgraph,
|
|||
|
||||
/* Export deformed coordinates. */
|
||||
if (ccl::BKE_object_is_deform_modified(b_ob_info, b_scene, preview)) {
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
if (b_ob_info.object_data.is_a(&RNA_Curves)) {
|
||||
/* Hair object. */
|
||||
sync_hair(hair, b_ob_info, true, motion_step);
|
||||
return;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
else {
|
||||
/* Particle hair. */
|
||||
BL::Mesh b_mesh = object_to_mesh(
|
||||
b_data, b_ob_info, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
|
||||
|
|
|
@ -18,11 +18,7 @@ CCL_NAMESPACE_BEGIN
|
|||
|
||||
static Geometry::Type determine_geom_type(BObjectInfo &b_ob_info, bool use_particle_hair)
|
||||
{
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
if (b_ob_info.object_data.is_a(&RNA_Curves) || use_particle_hair) {
|
||||
#else
|
||||
if (use_particle_hair) {
|
||||
#endif
|
||||
return Geometry::HAIR;
|
||||
}
|
||||
|
||||
|
@ -217,11 +213,7 @@ void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph,
|
|||
if (progress.get_cancel())
|
||||
return;
|
||||
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
if (b_ob_info.object_data.is_a(&RNA_Curves) || use_particle_hair) {
|
||||
#else
|
||||
if (use_particle_hair) {
|
||||
#endif
|
||||
Hair *hair = static_cast<Hair *>(geom);
|
||||
sync_hair_motion(b_depsgraph, b_ob_info, hair, motion_step);
|
||||
}
|
||||
|
|
|
@ -76,7 +76,6 @@ endif()
|
|||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_SIMULATION_DATABLOCK)
|
||||
add_definitions(-DWITH_POINT_CLOUD)
|
||||
add_definitions(-DWITH_NEW_CURVES_TYPE)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
|
|
@ -35,7 +35,6 @@ endif()
|
|||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_SIMULATION_DATABLOCK)
|
||||
add_definitions(-DWITH_POINT_CLOUD)
|
||||
add_definitions(-DWITH_NEW_CURVES_TYPE)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
|
|
@ -258,11 +258,9 @@ static bool buttons_context_path_data(ButsContextPath *path, int type)
|
|||
if (RNA_struct_is_a(ptr->type, &RNA_GreasePencil) && (ELEM(type, -1, OB_GPENCIL))) {
|
||||
return true;
|
||||
}
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
if (RNA_struct_is_a(ptr->type, &RNA_Curves) && (ELEM(type, -1, OB_CURVES))) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
if (RNA_struct_is_a(ptr->type, &RNA_PointCloud) && (ELEM(type, -1, OB_POINTCLOUD))) {
|
||||
return true;
|
||||
|
@ -830,9 +828,7 @@ const char *buttons_context_dir[] = {
|
|||
"line_style",
|
||||
"collection",
|
||||
"gpencil",
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
"curves",
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
"pointcloud",
|
||||
#endif
|
||||
|
@ -926,12 +922,10 @@ int /*eContextResult*/ buttons_context(const bContext *C,
|
|||
set_pointer_type(path, result, &RNA_LightProbe);
|
||||
return CTX_RESULT_OK;
|
||||
}
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
if (CTX_data_equals(member, "curves")) {
|
||||
set_pointer_type(path, result, &RNA_Curves);
|
||||
return CTX_RESULT_OK;
|
||||
}
|
||||
#endif
|
||||
#ifdef WITH_POINT_CLOUD
|
||||
if (CTX_data_equals(member, "pointcloud")) {
|
||||
set_pointer_type(path, result, &RNA_PointCloud);
|
||||
|
|
|
@ -84,7 +84,6 @@ set(DEFSRC
|
|||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_SIMULATION_DATABLOCK)
|
||||
add_definitions(-DWITH_NEW_CURVES_TYPE)
|
||||
list(APPEND DEFSRC
|
||||
rna_curves.c
|
||||
rna_simulation.c
|
||||
|
|
|
@ -4435,9 +4435,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
|
|||
{"rna_dynamicpaint.c", NULL, RNA_def_dynamic_paint},
|
||||
{"rna_fcurve.c", "rna_fcurve_api.c", RNA_def_fcurve},
|
||||
{"rna_gpencil.c", NULL, RNA_def_gpencil},
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
{"rna_curves.c", NULL, RNA_def_curves},
|
||||
#endif
|
||||
{"rna_image.c", "rna_image_api.c", RNA_def_image},
|
||||
{"rna_key.c", NULL, RNA_def_key},
|
||||
{"rna_light.c", NULL, RNA_def_light},
|
||||
|
|
|
@ -375,11 +375,9 @@ short RNA_type_to_ID_code(const StructRNA *type)
|
|||
if (base_type == &RNA_FreestyleLineStyle) {
|
||||
return ID_LS;
|
||||
}
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
if (base_type == &RNA_Curves) {
|
||||
return ID_CV;
|
||||
}
|
||||
# endif
|
||||
if (base_type == &RNA_Lattice) {
|
||||
return ID_LT;
|
||||
}
|
||||
|
@ -483,11 +481,7 @@ StructRNA *ID_code_to_RNA_type(short idcode)
|
|||
case ID_GR:
|
||||
return &RNA_Collection;
|
||||
case ID_CV:
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
return &RNA_Curves;
|
||||
# else
|
||||
return &RNA_ID;
|
||||
# endif
|
||||
case ID_IM:
|
||||
return &RNA_Image;
|
||||
case ID_KE:
|
||||
|
|
|
@ -504,9 +504,7 @@ void RNA_def_main_cachefiles(BlenderRNA *brna, PropertyRNA *cprop);
|
|||
void RNA_def_main_paintcurves(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
void RNA_def_main_workspaces(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
void RNA_def_main_lightprobes(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
#ifdef WITH_NEW_CURVES_TYPE
|
||||
void RNA_def_main_hair_curves(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
#endif
|
||||
void RNA_def_main_pointclouds(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
void RNA_def_main_volumes(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
#ifdef WITH_SIMULATION_DATABLOCK
|
||||
|
|
|
@ -96,9 +96,7 @@ RNA_MAIN_LISTBASE_FUNCS_DEF(collections)
|
|||
RNA_MAIN_LISTBASE_FUNCS_DEF(curves)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(fonts)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(gpencils)
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(hair_curves)
|
||||
# endif
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(images)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(lattices)
|
||||
RNA_MAIN_LISTBASE_FUNCS_DEF(libraries)
|
||||
|
@ -375,7 +373,6 @@ void RNA_def_main(BlenderRNA *brna)
|
|||
"Light Probes",
|
||||
"Light Probe data-blocks",
|
||||
RNA_def_main_lightprobes},
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
/**
|
||||
* \note The name `hair_curves` is chosen to be different than `curves`,
|
||||
* but they are generic curve data-blocks, not just for hair.
|
||||
|
@ -386,7 +383,6 @@ void RNA_def_main(BlenderRNA *brna)
|
|||
"Hair Curves",
|
||||
"Hair curve data-blocks",
|
||||
RNA_def_main_hair_curves},
|
||||
# endif
|
||||
{"pointclouds",
|
||||
"PointCloud",
|
||||
"rna_Main_pointclouds_begin",
|
||||
|
|
|
@ -749,7 +749,6 @@ static bGPdata *rna_Main_gpencils_new(Main *bmain, const char *name)
|
|||
return gpd;
|
||||
}
|
||||
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
static Curves *rna_Main_hair_curves_new(Main *bmain, const char *name)
|
||||
{
|
||||
char safe_name[MAX_ID_NAME - 2];
|
||||
|
@ -762,7 +761,6 @@ static Curves *rna_Main_hair_curves_new(Main *bmain, const char *name)
|
|||
|
||||
return curves;
|
||||
}
|
||||
# endif
|
||||
|
||||
static PointCloud *rna_Main_pointclouds_new(Main *bmain, const char *name)
|
||||
{
|
||||
|
@ -847,9 +845,7 @@ RNA_MAIN_ID_TAG_FUNCS_DEF(cachefiles, cachefiles, ID_CF)
|
|||
RNA_MAIN_ID_TAG_FUNCS_DEF(paintcurves, paintcurves, ID_PC)
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(workspaces, workspaces, ID_WS)
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(lightprobes, lightprobes, ID_LP)
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(hair_curves, hair_curves, ID_CV)
|
||||
# endif
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(pointclouds, pointclouds, ID_PT)
|
||||
RNA_MAIN_ID_TAG_FUNCS_DEF(volumes, volumes, ID_VO)
|
||||
# ifdef WITH_SIMULATION_DATABLOCK
|
||||
|
@ -2255,7 +2251,6 @@ void RNA_def_main_lightprobes(BlenderRNA *brna, PropertyRNA *cprop)
|
|||
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
||||
}
|
||||
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
void RNA_def_main_hair_curves(BlenderRNA *brna, PropertyRNA *cprop)
|
||||
{
|
||||
StructRNA *srna;
|
||||
|
@ -2299,7 +2294,6 @@ void RNA_def_main_hair_curves(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_pointclouds(BlenderRNA *brna, PropertyRNA *cprop)
|
||||
{
|
||||
|
|
|
@ -607,11 +607,7 @@ static StructRNA *rna_Object_data_typef(PointerRNA *ptr)
|
|||
case OB_GPENCIL:
|
||||
return &RNA_GreasePencil;
|
||||
case OB_CURVES:
|
||||
# ifdef WITH_NEW_CURVES_TYPE
|
||||
return &RNA_Curves;
|
||||
# else
|
||||
return &RNA_ID;
|
||||
# endif
|
||||
case OB_POINTCLOUD:
|
||||
return &RNA_PointCloud;
|
||||
case OB_VOLUME:
|
||||
|
|
|
@ -217,7 +217,6 @@ endif()
|
|||
|
||||
if(WITH_EXPERIMENTAL_FEATURES)
|
||||
add_definitions(-DWITH_SIMULATION_DATABLOCK)
|
||||
add_definitions(-DWITH_NEW_CURVES_TYPE)
|
||||
endif()
|
||||
|
||||
# So we can have special tricks in modifier system.
|
||||
|
|
Loading…
Reference in New Issue