From 251282d2cf7c909e12c40078c62d42032f5eb801 Mon Sep 17 00:00:00 2001 From: DualMatrix Date: Sat, 29 Sep 2018 13:40:29 +0200 Subject: [PATCH] Made Debugger's Video Memory tab show correct resource paths. Made Debugger's Video Memory tab show correct resource paths. The Icons are still missing but that is due to the get_icon(type, "EditorIcons") for type = "Texture" being missing. Adding that icon would fix it. (cherry picked from commit 8f89e2b4902f9de1982fad014e490cc227322c73) --- scene/resources/texture.cpp | 9 +++++++++ scene/resources/texture.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index fd04219d35e..ad3d4a50529 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -381,6 +381,15 @@ ImageTexture::~ImageTexture() { ////////////////////////////////////////// +void StreamTexture::set_path(const String &p_path, bool p_take_over) { + + if (texture.is_valid()) { + VisualServer::get_singleton()->texture_set_path(texture, p_path); + } + + Resource::set_path(p_path, p_take_over); +} + void StreamTexture::_requested_3d(void *p_ud) { StreamTexture *st = (StreamTexture *)p_ud; diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 0553a355b2b..903d823f6d9 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -206,6 +206,8 @@ public: int get_height() const; virtual RID get_rid() const; + virtual void set_path(const String &p_path, bool p_take_over); + virtual void draw(RID p_canvas_item, const Point2 &p_pos, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref &p_normal_map = Ref()) const; virtual void draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref &p_normal_map = Ref()) const; virtual void draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref &p_normal_map = Ref(), bool p_clip_uv = true) const;