summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDualMatrix <piet.goris@gmail.com>2018-09-29 13:40:29 +0200
committerDualMatrix <piet.goris@gmail.com>2018-09-29 13:40:29 +0200
commit8f89e2b4902f9de1982fad014e490cc227322c73 (patch)
treedf34dbfcb23e3ac09adb12b518dc7b0f5947729b
parentd4df4c1475e5aedec43c7cfae752c1136ef22792 (diff)
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.
-rw-r--r--scene/resources/texture.cpp9
-rw-r--r--scene/resources/texture.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 16b4ed31df..19f3562881 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -423,6 +423,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 cb759c63da..e9b69e9cb1 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -219,6 +219,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<Texture> &p_normal_map = Ref<Texture>()) 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<Texture> &p_normal_map = Ref<Texture>()) 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<Texture> &p_normal_map = Ref<Texture>(), bool p_clip_uv = true) const;