diff options
author | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-24 11:55:00 -0300 |
---|---|---|
committer | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-24 11:55:00 -0300 |
commit | 754908844ae52c04ed68ef27c02481479f1e2ab4 (patch) | |
tree | 90b95accfabc9bc12a6479c004183ff7d28b6fcd /scene/resources/texture.cpp | |
parent | 6df7d923797908ecf38684c0008c0e4b6475d884 (diff) | |
parent | 4baf65dab78b6e8062de760010338c316c628394 (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot into posta
Diffstat (limited to 'scene/resources/texture.cpp')
-rw-r--r-- | scene/resources/texture.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 7b261f7791..994473f11e 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -366,6 +366,16 @@ void ImageTexture::set_size_override(const Size2& p_size) { VisualServer::get_singleton()->texture_set_size_override(texture,w,h); } +void ImageTexture::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 ImageTexture::set_storage(Storage p_storage) { storage=p_storage; @@ -944,6 +954,16 @@ float CubeMap::get_lossy_storage_quality() const { return lossy_storage_quality; } +void CubeMap::set_path(const String& p_path,bool p_take_over) { + + if (cubemap.is_valid()) { + VisualServer::get_singleton()->texture_set_path(cubemap,p_path); + } + + Resource::set_path(p_path,p_take_over); +} + + bool CubeMap::_set(const StringName& p_name, const Variant& p_value) { if (p_name=="side/left") { |