diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:30:08 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:30:08 -0300 |
commit | 63033aa646f7a49fbcecbc8cc30077cf268be10c (patch) | |
tree | 80ccf1aed83e6c4d3ed1db2e1d2c0258090f7339 /scene/2d/sprite.cpp | |
parent | ab22203791489df160c36a29a3cd8aa8b32bec04 (diff) | |
parent | 0d2b28377f1257af039c088f30c11aa0d12cc695 (diff) | |
download | redot-engine-63033aa646f7a49fbcecbc8cc30077cf268be10c.tar.gz |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/2d/sprite.cpp')
-rw-r--r-- | scene/2d/sprite.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index 87697fc073..89d9966958 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -30,6 +30,7 @@ #include "core/core_string_names.h" #include "scene/scene_string_names.h" #include "scene/main/viewport.h" +#include "os/os.h" void Sprite::edit_set_pivot(const Point2& p_pivot) { @@ -85,6 +86,9 @@ void Sprite::_notification(int p_what) { Point2 ofs=offset; if (centered) ofs-=s/2; + if (OS::get_singleton()->get_use_pixel_snap()) { + ofs=ofs.floor(); + } Rect2 dst_rect(ofs,s); @@ -422,6 +426,9 @@ void ViewportSprite::_notification(int p_what) { if (centered) ofs-=s/2; + if (OS::get_singleton()->get_use_pixel_snap()) { + ofs=ofs.floor(); + } Rect2 dst_rect(ofs,s); texture->draw_rect_region(ci,dst_rect,src_rect,modulate); |