Merge remote-tracking branch 'origin/dev2' into dev_native

This commit is contained in:
bubnikv
2018-09-20 16:48:40 +02:00
34 changed files with 1300 additions and 694 deletions

View File

@@ -124,6 +124,9 @@ void update_scale_values(double scaling_factor);
void update_rotation_values();
// update rotation value after "gizmos"
void update_rotation_value(double angle, Axis axis);
#if ENABLE_MODELINSTANCE_3D_ROTATION
void update_rotation_value(const Vec3d& rotation);
#endif // ENABLE_MODELINSTANCE_3D_ROTATION
void set_uniform_scaling(const bool uniform_scale);
void on_begin_drag(wxDataViewEvent &event);