Removed tech ENABLE_WORLD_COORDINATE_VOLUMES_LOCAL_OFFSET
This commit is contained in:
parent
4846b504a2
commit
f591535d20
@ -71,8 +71,6 @@
|
|||||||
#define ENABLE_VOLUMETRIC_RATE_TOOLPATHS_RECALC (1 && ENABLE_2_5_0_ALPHA1)
|
#define ENABLE_VOLUMETRIC_RATE_TOOLPATHS_RECALC (1 && ENABLE_2_5_0_ALPHA1)
|
||||||
// Enable editing volumes transformation in world coordinates and instances in local coordinates
|
// Enable editing volumes transformation in world coordinates and instances in local coordinates
|
||||||
#define ENABLE_WORLD_COORDINATE (1 && ENABLE_2_5_0_ALPHA1)
|
#define ENABLE_WORLD_COORDINATE (1 && ENABLE_2_5_0_ALPHA1)
|
||||||
// Enable showing world coordinates of volumes' offset relative to the instance containing them
|
|
||||||
#define ENABLE_WORLD_COORDINATE_VOLUMES_LOCAL_OFFSET (0 && ENABLE_WORLD_COORDINATE)
|
|
||||||
// Enable implementation of Geometry::Transformation using matrices only
|
// Enable implementation of Geometry::Transformation using matrices only
|
||||||
#define ENABLE_TRANSFORMATIONS_BY_MATRICES (1 && ENABLE_WORLD_COORDINATE)
|
#define ENABLE_TRANSFORMATIONS_BY_MATRICES (1 && ENABLE_WORLD_COORDINATE)
|
||||||
// Enable modified camera control using mouse
|
// Enable modified camera control using mouse
|
||||||
|
@ -727,11 +727,7 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
|
|||||||
if (is_world_coordinates()) {
|
if (is_world_coordinates()) {
|
||||||
const Geometry::Transformation trafo(volume->world_matrix());
|
const Geometry::Transformation trafo(volume->world_matrix());
|
||||||
|
|
||||||
#if ENABLE_WORLD_COORDINATE_VOLUMES_LOCAL_OFFSET
|
|
||||||
const Vec3d offset = trafo.get_offset() - volume->get_instance_offset();
|
|
||||||
#else
|
|
||||||
const Vec3d& offset = trafo.get_offset();
|
const Vec3d& offset = trafo.get_offset();
|
||||||
#endif // ENABLE_WORLD_COORDINATE_VOLUMES_LOCAL_OFFSET
|
|
||||||
|
|
||||||
m_new_position = offset;
|
m_new_position = offset;
|
||||||
m_new_rotate_label_string = L("Rotate");
|
m_new_rotate_label_string = L("Rotate");
|
||||||
|
Loading…
Reference in New Issue
Block a user