diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /scene/2d/sprite.cpp | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
| download | redot-engine-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.gz | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'scene/2d/sprite.cpp')
| -rw-r--r-- | scene/2d/sprite.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index c885dddee8..51329ff996 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -377,7 +377,7 @@ Sprite::Sprite() { /// /// - +#if 0 void ViewportSprite::edit_set_pivot(const Point2& p_pivot) { set_offset(p_pivot); @@ -589,3 +589,4 @@ ViewportSprite::ViewportSprite() { centered=true; modulate=Color(1,1,1,1); } +#endif |