godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63958 from hakro/fix-control-animation-keys 

Remove rect_ prefix from control properties when keyframing
This commit is contained in:
Rémi Verschelde 2022-08-06 00:17:37 +02:00 committed by GitHub
parent 94664b4e61 60677c4e95
commit 99aa97949f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Camera3D.xml
View File

@ -144,7 +144,7 @@
# This code block is part of a script that inherits from Node3D. # This code block is part of a script that inherits from Node3D.
# `control` is a reference to a node inheriting from Control. # `control` is a reference to a node inheriting from Control.
control.visible = not get_viewport().get_camera_3d().is_position_behind(global_transform.origin) control.visible = not get_viewport().get_camera_3d().is_position_behind(global_transform.origin)
control.rect_position = get_viewport().get_camera_3d().unproject_position(global_transform.origin) control.position = get_viewport().get_camera_3d().unproject_position(global_transform.origin)
[/codeblock] [/codeblock]
</description> </description>
</method> </method>

6
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -4237,13 +4237,13 @@ void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation,
Control *ctrl = Object::cast_to<Control>(canvas_item); Control *ctrl = Object::cast_to<Control>(canvas_item);
if (key_pos) { if (key_pos) {
te->insert_node_value_key(ctrl, "rect_position", ctrl->get_position(), p_on_existing); te->insert_node_value_key(ctrl, "position", ctrl->get_position(), p_on_existing);
} }
if (key_rot) { if (key_rot) {
te->insert_node_value_key(ctrl, "rect_rotation", ctrl->get_rotation(), p_on_existing); te->insert_node_value_key(ctrl, "rotation", ctrl->get_rotation(), p_on_existing);
} }
if (key_scale) { if (key_scale) {
te->insert_node_value_key(ctrl, "rect_size", ctrl->get_size(), p_on_existing); te->insert_node_value_key(ctrl, "size", ctrl->get_size(), p_on_existing);
} }
} }
} }

2
scene/gui/graph_node.cpp
View File

@ -450,7 +450,7 @@ void GraphNode::_validate_property(PropertyInfo &property) const {
Control::_validate_property(property); Control::_validate_property(property);
GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent()); GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
if (graph) { if (graph) {
if (property.name == "rect_position") { if (property.name == "position") {
property.usage |= PROPERTY_USAGE_READ_ONLY; property.usage |= PROPERTY_USAGE_READ_ONLY;
} }
} }