diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-07 19:24:59 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-07 19:42:21 +0300 |
commit | c50e5fcc344d00b03eb4a3141b5b45944c3570fd (patch) | |
tree | f683ae1a1f38551d160a5be2ee86561d51faca26 /source/blender/modifiers | |
parent | 28b10224346a9a2e55267f98357991a841eeda5b (diff) |
Cleanup: use C++ style casts in various places
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_mask.cc | 8 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_simulation.cc | 31 |
2 files changed, 20 insertions, 19 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 7b09d3c470d..c173ab52ce8 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -77,13 +77,13 @@ static void requiredDataMask(Object *UNUSED(ob), static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData) { - MaskModifierData *mmd = (MaskModifierData *)md; + MaskModifierData *mmd = reinterpret_cast<MaskModifierData *>(md); walk(userData, ob, &mmd->ob_arm, IDWALK_CB_NOP); } static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx) { - MaskModifierData *mmd = (MaskModifierData *)md; + MaskModifierData *mmd = reinterpret_cast<MaskModifierData *>(md); if (mmd->ob_arm) { bArmature *arm = (bArmature *)mmd->ob_arm->data; /* Tag relationship in depsgraph, but also on the armature. */ @@ -306,7 +306,7 @@ static void copy_masked_polys_to_new_mesh(const Mesh &src_mesh, */ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) { - MaskModifierData *mmd = (MaskModifierData *)md; + MaskModifierData *mmd = reinterpret_cast<MaskModifierData *>(md); Object *ob = ctx->object; const bool invert_mask = mmd->flag & MOD_MASK_INV; @@ -388,7 +388,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), ModifierData *md, bool UNUSED(useRenderParams)) { - MaskModifierData *mmd = (MaskModifierData *)md; + MaskModifierData *mmd = reinterpret_cast<MaskModifierData *>(md); /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the armature is missing). diff --git a/source/blender/modifiers/intern/MOD_simulation.cc b/source/blender/modifiers/intern/MOD_simulation.cc index 92ad02ae34a..99cd582f37d 100644 --- a/source/blender/modifiers/intern/MOD_simulation.cc +++ b/source/blender/modifiers/intern/MOD_simulation.cc @@ -66,7 +66,7 @@ using blender::float3; static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx) { - SimulationModifierData *smd = (SimulationModifierData *)md; + SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md); if (smd->simulation) { DEG_add_simulation_relation(ctx->node, smd->simulation, "Accessed Simulation"); } @@ -74,7 +74,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData) { - SimulationModifierData *smd = (SimulationModifierData *)md; + SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md); walk(userData, ob, (ID **)&smd->simulation, IDWALK_CB_USER); } @@ -82,21 +82,22 @@ static bool isDisabled(const struct Scene *UNUSED(scene), ModifierData *md, bool UNUSED(useRenderParams)) { - SimulationModifierData *smd = (SimulationModifierData *)md; + SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md); return smd->simulation == nullptr; } static const ParticleSimulationState *find_particle_state(SimulationModifierData *smd) { - return (const ParticleSimulationState *)BKE_simulation_state_try_find_by_name_and_type( - smd->simulation, smd->data_path, SIM_TYPE_NAME_PARTICLE_SIMULATION); + return reinterpret_cast<const ParticleSimulationState *>( + BKE_simulation_state_try_find_by_name_and_type( + smd->simulation, smd->data_path, SIM_TYPE_NAME_PARTICLE_SIMULATION)); } static PointCloud *modifyPointCloud(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), PointCloud *input_pointcloud) { - SimulationModifierData *smd = (SimulationModifierData *)md; + SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md); const ParticleSimulationState *state = find_particle_state(smd); if (state == nullptr) { return input_pointcloud; @@ -107,10 +108,10 @@ static PointCloud *modifyPointCloud(ModifierData *md, return pointcloud; } - const float3 *positions = (const float3 *)CustomData_get_layer_named( - &state->attributes, CD_PROP_FLOAT3, "Position"); - const float *radii = (const float *)CustomData_get_layer_named( - &state->attributes, CD_PROP_FLOAT, "Radius"); + const float3 *positions = static_cast<const float3 *>( + CustomData_get_layer_named(&state->attributes, CD_PROP_FLOAT3, "Position")); + const float *radii = static_cast<const float *>( + CustomData_get_layer_named(&state->attributes, CD_PROP_FLOAT, "Radius")); memcpy(pointcloud->co, positions, sizeof(float3) * state->tot_particles); for (int i = 0; i < state->tot_particles; i++) { @@ -144,20 +145,20 @@ static void panelRegister(ARegionType *region_type) static void blendWrite(BlendWriter *writer, const ModifierData *md) { - const SimulationModifierData *smd = (const SimulationModifierData *)md; + const SimulationModifierData *smd = reinterpret_cast<const SimulationModifierData *>(md); BLO_write_string(writer, smd->data_path); } static void blendRead(BlendDataReader *reader, ModifierData *md) { - SimulationModifierData *smd = (SimulationModifierData *)md; + SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md); BLO_read_data_address(reader, &smd->data_path); } static void copyData(const ModifierData *md, ModifierData *target, const int flag) { - const SimulationModifierData *smd = (const SimulationModifierData *)md; - SimulationModifierData *tsmd = (SimulationModifierData *)target; + const SimulationModifierData *smd = reinterpret_cast<const SimulationModifierData *>(md); + SimulationModifierData *tsmd = reinterpret_cast<SimulationModifierData *>(target); BKE_modifier_copydata_generic(md, target, flag); if (smd->data_path != nullptr) { @@ -167,7 +168,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla static void freeData(ModifierData *md) { - SimulationModifierData *smd = (SimulationModifierData *)md; + SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md); if (smd->data_path) { MEM_freeN(smd->data_path); } |