blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: Remove unnecessary dynamic_cast in simulation state creation #107796

Closed
Hans Goudey wants to merge 2 commits from HooglyBoogly:cleanup-sim-output-remove-dynamic-cast into main
pull from: HooglyBoogly:cleanup-sim-output-remove-dynamic-cast
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 2 Files Changed 1 +7 -17
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
View File

@ -178,15 +178,10 @@ void simulation_state_to_values(const Span<NodeSimulationItem> node_simulation_i
switch (socket_type) {
case SOCK_GEOMETRY: {
if (const auto *geo_state_item =
dynamic_cast<const bke::sim::GeometrySimulationStateItem *>(&state_item))
{
GeometrySet *geometry = new (r_output_value) GeometrySet(geo_state_item->geometry);
geometries.append(geometry);
}
else {
cpp_type.value_initialize(r_output_value);
}
const auto &geo_state_item = static_cast<const bke::sim::GeometrySimulationStateItem &>(
state_item);
GeometrySet *geometry = new (r_output_value) GeometrySet(geo_state_item.geometry);
geometries.append(geometry);
break;
}
case SOCK_FLOAT:
@ -228,14 +223,9 @@ void simulation_state_to_values(const Span<NodeSimulationItem> node_simulation_i
break;
}
case SOCK_STRING: {
if (const auto *string_state_item =
dynamic_cast<const bke::sim::StringSimulationStateItem *>(&state_item))
{
new (r_output_value) ValueOrField<std::string>(string_state_item->value());
}
else {
cpp_type.value_initialize(r_output_value);
}
const auto &string_state_item = static_cast<const bke::sim::StringSimulationStateItem &>(
state_item);
new (r_output_value) ValueOrField<std::string>(string_state_item.value());
break;
}
default: {