diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-06-16 21:47:28 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-06-16 21:49:37 -0300 |
commit | b19225bfce3dab39f8ce6b1ecf610ea0ba650f99 (patch) | |
tree | 7946e6eabae1c679a404a9146343fe2b6f2672b7 /scene/main | |
parent | 8a03a29233d5ef4cf5be3aeebd76cb77c82bc983 (diff) |
-Fix freezes caused by etccomp2, closes #9183
-Normalmaps are now detected and imported as RGTC, both in S3TC and ETC2, this improves their quality.
Diffstat (limited to 'scene/main')
-rw-r--r-- | scene/main/viewport.cpp | 12 | ||||
-rw-r--r-- | scene/main/viewport.h | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index d8ec8b9991..714327c5b7 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1233,16 +1233,6 @@ Viewport::UpdateMode Viewport::get_update_mode() const { } //RID get_texture() const; -void Viewport::queue_screen_capture() { - - //VS::get_singleton()->viewport_queue_screen_capture(viewport); -} -Ref<Image> Viewport::get_screen_capture() const { - - //return VS::get_singleton()->viewport_get_screen_capture(viewport); - return Ref<Image>(); -} - Ref<ViewportTexture> Viewport::get_texture() const { return default_texture; @@ -2581,8 +2571,6 @@ void Viewport::_bind_methods() { ClassDB::bind_method(D_METHOD("is_size_override_enabled"), &Viewport::is_size_override_enabled); ClassDB::bind_method(D_METHOD("set_size_override_stretch", "enabled"), &Viewport::set_size_override_stretch); ClassDB::bind_method(D_METHOD("is_size_override_stretch_enabled"), &Viewport::is_size_override_stretch_enabled); - ClassDB::bind_method(D_METHOD("queue_screen_capture"), &Viewport::queue_screen_capture); - ClassDB::bind_method(D_METHOD("get_screen_capture"), &Viewport::get_screen_capture); ClassDB::bind_method(D_METHOD("set_vflip", "enable"), &Viewport::set_vflip); ClassDB::bind_method(D_METHOD("get_vflip"), &Viewport::get_vflip); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 378055bef5..bd9747d878 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -413,9 +413,6 @@ public: Vector2 get_camera_coords(const Vector2 &p_viewport_coords) const; Vector2 get_camera_rect_size() const; - void queue_screen_capture(); - Ref<Image> get_screen_capture() const; - void set_use_own_world(bool p_world); bool is_using_own_world() const; |