Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Fixed translation of volumes in local coordinate system
Fixed conflicts during rebase with master
This commit is contained in:
parent
fd45d0eeed
commit
3fcfd04921
@ -783,8 +783,11 @@ void Selection::translate(const Vec3d& displacement, TransformationType transfor
|
|||||||
else
|
else
|
||||||
assert(false);
|
assert(false);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(displacement));
|
const Vec3d offset = transformation_type.local() ?
|
||||||
|
volume_data.get_volume_transform().get_rotation_matrix() * displacement : displacement;
|
||||||
|
transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(offset));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !DISABLE_INSTANCES_SYNCH
|
#if !DISABLE_INSTANCES_SYNCH
|
||||||
|
Loading…
Reference in New Issue
Block a user