blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Fix #104926: Object Info node doesn't give negative scale #116989

Merged
Hans Goudey merged 3 commits from HooglyBoogly/blender:fix-geometry-nodes-negative-scale into main 2024-01-10 17:36:01 +01:00
Conversation 2 Commits 3 Files Changed 3 +7 -8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
View File

@ -266,7 +266,7 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values(
if (STREQ(column_id.name, "Scale")) {
return std::make_unique<ColumnValues>(
column_id.name, VArray<float3>::ForFunc(domain_num, [transforms](int64_t index) {
return math::to_scale(transforms[index]);
return math::to_scale<true>(transforms[index]);
}));
}
}

9
source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc
View File

@ -22,11 +22,10 @@ class InstanceScaleFieldInput final : public bke::InstancesFieldInput {
GVArray get_varray_for_context(const bke::Instances &instances,
const IndexMask & /*mask*/) const final
{
auto scale_fn = [&](const int i) -> float3 {
return math::to_scale(instances.transforms()[i]);
};
return VArray<float3>::ForFunc(instances.instances_num(), scale_fn);
const Span<float4x4> transforms = instances.transforms();
return VArray<float3>::ForFunc(instances.instances_num(), [transforms](const int i) {
return math::to_scale<true>(transforms[i]);
});
}
uint64_t hash() const override

4
source/blender/nodes/geometry/nodes/node_geo_object_info.cc
View File

@ -58,10 +58,10 @@ static void node_geo_exec(GeoNodeExecParams params)
float3 location, scale;
math::Quaternion rotation;
if (transform_space_relative) {
math::to_loc_rot_scale(transform, location, rotation, scale);
math::to_loc_rot_scale<true>(transform, location, rotation, scale);
}
else {
math::to_loc_rot_scale(object_matrix, location, rotation, scale);
math::to_loc_rot_scale<true>(object_matrix, location, rotation, scale);
}
params.set_output("Location", location);
params.set_output("Rotation", rotation);