diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-10-15 06:49:10 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-15 06:49:10 -0400 |
| commit | 8043cc1e0d288d7b517d13f14c912c636293cc8b (patch) | |
| tree | 79fdac1a76ad232c040f25a4fbae974ac245edda /editor/plugins/node_3d_editor_plugin.h | |
| parent | 7894cd1a5a680020c51e0df96ce8675ad647d91b (diff) | |
| parent | af77100e394dcaca609b15bef815ed17475e51ed (diff) | |
| download | redot-engine-8043cc1e0d288d7b517d13f14c912c636293cc8b.tar.gz | |
Merge commit godotengine/godot@af77100e394dcaca609b15bef815ed17475e51ed
Diffstat (limited to 'editor/plugins/node_3d_editor_plugin.h')
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index 57c743a1db..a46f054878 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -247,6 +247,7 @@ private: bool auto_orthogonal; bool lock_rotation; bool transform_gizmo_visible = true; + bool collision_reposition = false; real_t gizmo_scale; bool freelook_active; @@ -340,7 +341,6 @@ private: TRANSFORM_ROTATE, TRANSFORM_TRANSLATE, TRANSFORM_SCALE - }; enum TransformPlane { TRANSFORM_VIEW, @@ -473,7 +473,7 @@ private: void _list_select(Ref<InputEventMouseButton> b); Point2 _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const; - Vector3 _get_instance_position(const Point2 &p_pos) const; + Vector3 _get_instance_position(const Point2 &p_pos, Node3D *p_node) const; static AABB _calculate_spatial_bounds(const Node3D *p_parent, bool p_omit_top_level = false, const Transform3D *p_bounds_orientation = nullptr); Node *_sanitize_preview_node(Node *p_node) const; |