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

Merge pull request #9486 from TwistedTwigleg/Node2D_set_global_scale_fix 

Fixed set_global_scale in Node2D.
This commit is contained in:
Rémi Verschelde 2017-07-03 22:11:40 +02:00 committed by GitHub
parent e63c64e256 a6feb0943a
commit 686e81fcd8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/2d/node_2d.cpp
View File

@ -319,7 +319,7 @@ void Node2D::set_global_scale(const Size2 &p_scale) {
CanvasItem *pi = get_parent_item(); CanvasItem *pi = get_parent_item();
if (pi) { if (pi) {
const Size2 parent_global_scale = pi->get_global_transform().get_scale(); const Size2 parent_global_scale = pi->get_global_transform().get_scale();
set_scale(p_scale - parent_global_scale); set_scale(p_scale / parent_global_scale);
} else { } else {
set_scale(p_scale); set_scale(p_scale);
} }