griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use non-void return types for BKE_*_add functions

Browse Source 
Many of the functions were already using proper types. This changes the
others still using `void *` to return their proper types directly.

Pull Request: https://projects.blender.org/blender/blender/pulls/128980
This commit is contained in:
Jesse Yurkovich
2024-10-17 21:05:18 +02:00
committed by Jesse Yurkovich
parent 4f4c3f73b6
commit 5c65ad4b1b
24 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_camera.h
View File

@@ -25,7 +25,7 @@ struct View3D;
/* Camera Data-block */
void *BKE_camera_add(struct Main *bmain, const char *name);
struct Camera *BKE_camera_add(struct Main *bmain, const char *name);
/* Camera Usage */

2
source/blender/blenkernel/BKE_curves.h
View File

@@ -21,7 +21,7 @@ struct Main;
struct Object;
struct Scene;
void *BKE_curves_add(struct Main *bmain, const char *name);
struct Curves *BKE_curves_add(struct Main *bmain, const char *name);
bool BKE_curves_attribute_required(const struct Curves *curves, const char *name);

2
source/blender/blenkernel/BKE_grease_pencil.hh
View File

@@ -1052,7 +1052,7 @@ inline bool GreasePencil::has_active_group() const
bool BKE_grease_pencil_drawing_attribute_required(const GreasePencilDrawing *, const char *name);
void *BKE_grease_pencil_add(Main *bmain, const char *name);
GreasePencil *BKE_grease_pencil_add(Main *bmain, const char *name);
GreasePencil *BKE_grease_pencil_new_nomain();
GreasePencil *BKE_grease_pencil_copy_for_eval(const GreasePencil *grease_pencil_src);
/** Copy everything except the layer tree and the drawings. */

2
source/blender/blenkernel/BKE_lightprobe.h
View File

@@ -22,7 +22,7 @@ struct LightProbeGridCacheFrame;
struct Object;
void BKE_lightprobe_type_set(struct LightProbe *probe, short lightprobe_type);
void *BKE_lightprobe_add(struct Main *bmain, const char *name);
struct LightProbe *BKE_lightprobe_add(struct Main *bmain, const char *name);
void BKE_lightprobe_cache_blend_write(struct BlendWriter *writer,
struct LightProbeObjectCache *cache);

4
source/blender/blenkernel/BKE_pointcloud.hh
View File

@@ -50,8 +50,8 @@ PointCloud *pointcloud_new_no_attributes(int totpoint);
} // namespace blender::bke
void *BKE_pointcloud_add(Main *bmain, const char *name);
void *BKE_pointcloud_add_default(Main *bmain, const char *name);
PointCloud *BKE_pointcloud_add(Main *bmain, const char *name);
PointCloud *BKE_pointcloud_add_default(Main *bmain, const char *name);
PointCloud *BKE_pointcloud_new_nomain(int totpoint);
void BKE_pointcloud_nomain_to_pointcloud(PointCloud *pointcloud_src, PointCloud *pointcloud_dst);

3
source/blender/blenkernel/BKE_speaker.h
View File

@@ -14,8 +14,9 @@ extern "C" {
#endif
struct Main;
struct Speaker;
void *BKE_speaker_add(struct Main *bmain, const char *name);
struct Speaker *BKE_speaker_add(struct Main *bmain, const char *name);
#ifdef __cplusplus
}

2
source/blender/blenkernel/BKE_volume.hh
View File

@@ -37,7 +37,7 @@ void BKE_volumes_init();
/* Data-block Management */
void BKE_volume_init_grids(Volume *volume);
void *BKE_volume_add(Main *bmain, const char *name);
Volume *BKE_volume_add(Main *bmain, const char *name);
bool BKE_volume_is_y_up(const Volume *volume);
bool BKE_volume_is_points_only(const Volume *volume);

2
source/blender/blenkernel/intern/camera.cc
View File

@@ -260,7 +260,7 @@ IDTypeInfo IDType_ID_CA = {
/** \name Camera Usage
* \{ */
void *BKE_camera_add(Main *bmain, const char *name)
Camera *BKE_camera_add(Main *bmain, const char *name)
{
Camera *cam;

2
source/blender/blenkernel/intern/curves.cc
View File

@@ -168,7 +168,7 @@ IDTypeInfo IDType_ID_CV = {
/*lib_override_apply_post*/ nullptr,
};
void *BKE_curves_add(Main *bmain, const char *name)
Curves *BKE_curves_add(Main *bmain, const char *name)
{
Curves *curves = static_cast<Curves *>(BKE_id_new(bmain, ID_CV, name));

2
source/blender/blenkernel/intern/grease_pencil.cc
View File

@@ -1895,7 +1895,7 @@ bool BKE_grease_pencil_drawing_attribute_required(const GreasePencilDrawing * /*
return STREQ(name, ATTR_POSITION);
}
void *BKE_grease_pencil_add(Main *bmain, const char *name)
GreasePencil *BKE_grease_pencil_add(Main *bmain, const char *name)
{
GreasePencil *grease_pencil = reinterpret_cast<GreasePencil *>(BKE_id_new(bmain, ID_GP, name));

2
source/blender/blenkernel/intern/lightprobe.cc
View File

@@ -104,7 +104,7 @@ void BKE_lightprobe_type_set(LightProbe *probe, const short lightprobe_type)
}
}
void *BKE_lightprobe_add(Main *bmain, const char *name)
LightProbe *BKE_lightprobe_add(Main *bmain, const char *name)
{
LightProbe *probe;

2
source/blender/blenkernel/intern/mesh_convert.cc
View File

@@ -545,7 +545,7 @@ void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/
return;
}
PointCloud *pointcloud = (PointCloud *)BKE_pointcloud_add(bmain, ob->id.name + 2);
PointCloud *pointcloud = BKE_pointcloud_add(bmain, ob->id.name + 2);
CustomData_free(&pointcloud->pdata, pointcloud->totpoint);
pointcloud->totpoint = mesh_eval->verts_num;

4
source/blender/blenkernel/intern/pointcloud.cc
View File

@@ -216,14 +216,14 @@ MutableSpan<float3> PointCloud::positions_for_write()
this->totpoint};
}
void *BKE_pointcloud_add(Main *bmain, const char *name)
PointCloud *BKE_pointcloud_add(Main *bmain, const char *name)
{
PointCloud *pointcloud = static_cast<PointCloud *>(BKE_id_new(bmain, ID_PT, name));
return pointcloud;
}
void *BKE_pointcloud_add_default(Main *bmain, const char *name)
PointCloud *BKE_pointcloud_add_default(Main *bmain, const char *name)
{
PointCloud *pointcloud = static_cast<PointCloud *>(BKE_libblock_alloc(bmain, ID_PT, name, 0));

2
source/blender/blenkernel/intern/speaker.cc
View File

@@ -78,7 +78,7 @@ IDTypeInfo IDType_ID_SPK = {
/*lib_override_apply_post*/ nullptr,
};
void *BKE_speaker_add(Main *bmain, const char *name)
Speaker *BKE_speaker_add(Main *bmain, const char *name)
{
Speaker *spk;

2
source/blender/blenkernel/intern/volume.cc
View File

@@ -321,7 +321,7 @@ void BKE_volume_init_grids(Volume *volume)
#endif
}
void *BKE_volume_add(Main *bmain, const char *name)
Volume *BKE_volume_add(Main *bmain, const char *name)
{
Volume *volume = (Volume *)BKE_id_new(bmain, ID_VO, name);

2
source/blender/io/alembic/intern/abc_reader_camera.cc
View File

@@ -64,7 +64,7 @@ bool AbcCameraReader::accepts_object_type(
void AbcCameraReader::readObjectData(Main *bmain, const ISampleSelector &sample_sel)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_data_name.c_str()));
Camera *bcam = BKE_camera_add(bmain, m_data_name.c_str());
CameraSample cam_sample;
m_schema.get(cam_sample, sample_sel);

2
source/blender/io/alembic/intern/abc_reader_curves.cc
View File

@@ -339,7 +339,7 @@ bool AbcCurveReader::accepts_object_type(
void AbcCurveReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel)
{
Curves *curves = static_cast<Curves *>(BKE_curves_add(bmain, m_data_name.c_str()));
Curves *curves = BKE_curves_add(bmain, m_data_name.c_str());
m_object = BKE_object_add_only_object(bmain, OB_CURVES, m_object_name.c_str());
m_object->data = curves;

3
source/blender/io/alembic/intern/abc_reader_points.cc
View File

@@ -60,8 +60,7 @@ bool AbcPointsReader::accepts_object_type(
void AbcPointsReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel)
{
PointCloud *point_cloud = static_cast<PointCloud *>(
BKE_pointcloud_add_default(bmain, m_data_name.c_str()));
PointCloud *point_cloud = BKE_pointcloud_add_default(bmain, m_data_name.c_str());
bke::GeometrySet geometry_set = bke::GeometrySet::from_pointcloud(
point_cloud, bke::GeometryOwnershipType::Editable);

2
source/blender/io/usd/intern/usd_reader_camera.cc
View File

@@ -21,7 +21,7 @@ namespace blender::io::usd {
void USDCameraReader::create_object(Main *bmain, const double /*motionSampleTime*/)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, name_.c_str()));
Camera *bcam = BKE_camera_add(bmain, name_.c_str());
object_ = BKE_object_add_only_object(bmain, OB_CAMERA, name_.c_str());
object_->data = bcam;

2
source/blender/io/usd/intern/usd_reader_curve.cc
View File

@@ -132,7 +132,7 @@ static std::optional<bke::AttrDomain> convert_usd_interp_to_blender(const pxr::T
void USDCurvesReader::create_object(Main *bmain, const double /*motionSampleTime*/)
{
curve_ = static_cast<Curves *>(BKE_curves_add(bmain, name_.c_str()));
curve_ = BKE_curves_add(bmain, name_.c_str());
object_ = BKE_object_add_only_object(bmain, OB_CURVES, name_.c_str());
object_->data = curve_;

2
source/blender/io/usd/intern/usd_reader_pointinstancer.cc
View File

@@ -50,7 +50,7 @@ bool USDPointInstancerReader::valid() const
void USDPointInstancerReader::create_object(Main *bmain, const double /*motionSampleTime*/)
{
void *point_cloud = BKE_pointcloud_add(bmain, name_.c_str());
PointCloud *point_cloud = BKE_pointcloud_add(bmain, name_.c_str());
this->object_ = BKE_object_add_only_object(bmain, OB_POINTCLOUD, name_.c_str());
this->object_->data = point_cloud;
}

2
source/blender/io/usd/intern/usd_reader_points.cc
View File

@@ -33,7 +33,7 @@ bool USDPointsReader::valid() const
void USDPointsReader::create_object(Main *bmain, double /*motionSampleTime*/)
{
PointCloud *point_cloud = static_cast<PointCloud *>(BKE_pointcloud_add(bmain, name_.c_str()));
PointCloud *point_cloud = BKE_pointcloud_add(bmain, name_.c_str());
object_ = BKE_object_add_only_object(bmain, OB_POINTCLOUD, name_.c_str());
object_->data = point_cloud;
}

2
source/blender/io/usd/intern/usd_reader_volume.cc
View File

@@ -25,7 +25,7 @@ namespace blender::io::usd {
void USDVolumeReader::create_object(Main *bmain, const double /*motionSampleTime*/)
{
Volume *volume = (Volume *)BKE_volume_add(bmain, name_.c_str());
Volume *volume = BKE_volume_add(bmain, name_.c_str());
object_ = BKE_object_add_only_object(bmain, OB_VOLUME, name_.c_str());
object_->data = volume;

19
source/blender/makesrna/intern/rna_main_api.cc
View File

@@ -156,12 +156,12 @@ static Camera *rna_Main_cameras_new(Main *bmain, const char *name)
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
ID *id = static_cast<ID *>(BKE_camera_add(bmain, safe_name));
id_us_min(id);
Camera *camera = BKE_camera_add(bmain, safe_name);
id_us_min(&camera->id);
WM_main_add_notifier(NC_ID | NA_ADDED, nullptr);
return (Camera *)id;
return camera;
}
static Scene *rna_Main_scenes_new(Main *bmain, const char *name)
@@ -549,7 +549,7 @@ static Speaker *rna_Main_speakers_new(Main *bmain, const char *name)
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
Speaker *speaker = static_cast<Speaker *>(BKE_speaker_add(bmain, safe_name));
Speaker *speaker = BKE_speaker_add(bmain, safe_name);
id_us_min(&speaker->id);
WM_main_add_notifier(NC_ID | NA_ADDED, nullptr);
@@ -728,7 +728,7 @@ static LightProbe *rna_Main_lightprobe_new(Main *bmain, const char *name, int ty
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
LightProbe *probe = static_cast<LightProbe *>(BKE_lightprobe_add(bmain, safe_name));
LightProbe *probe = BKE_lightprobe_add(bmain, safe_name);
BKE_lightprobe_type_set(probe, type);
@@ -757,8 +757,7 @@ static GreasePencil *rna_Main_grease_pencils_new(Main *bmain, const char *name)
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
GreasePencil *grease_pencil = static_cast<GreasePencil *>(
BKE_grease_pencil_add(bmain, safe_name));
GreasePencil *grease_pencil = BKE_grease_pencil_add(bmain, safe_name);
id_us_min(&grease_pencil->id);
WM_main_add_notifier(NC_ID | NA_ADDED, nullptr);
@@ -771,7 +770,7 @@ static Curves *rna_Main_hair_curves_new(Main *bmain, const char *name)
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
Curves *curves = static_cast<Curves *>(BKE_curves_add(bmain, safe_name));
Curves *curves = BKE_curves_add(bmain, safe_name);
id_us_min(&curves->id);
WM_main_add_notifier(NC_ID | NA_ADDED, nullptr);
@@ -784,7 +783,7 @@ static PointCloud *rna_Main_pointclouds_new(Main *bmain, const char *name)
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
PointCloud *pointcloud = static_cast<PointCloud *>(BKE_pointcloud_add(bmain, safe_name));
PointCloud *pointcloud = BKE_pointcloud_add(bmain, safe_name);
id_us_min(&pointcloud->id);
WM_main_add_notifier(NC_ID | NA_ADDED, nullptr);
@@ -797,7 +796,7 @@ static Volume *rna_Main_volumes_new(Main *bmain, const char *name)
char safe_name[MAX_ID_NAME - 2];
rna_idname_validate(name, safe_name);
Volume *volume = static_cast<Volume *>(BKE_volume_add(bmain, safe_name));
Volume *volume = BKE_volume_add(bmain, safe_name);
id_us_min(&volume->id);
WM_main_add_notifier(NC_ID | NA_ADDED, nullptr);