godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-fixed old condition in TextureFrame that caused bugs in materials, closes #1742

Browse Source
This commit is contained in:
Juan Linietsky 2015-05-01 12:16:51 -03:00
parent bf53b7789a
commit c45ffc2ca9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gles2/rasterizer_gles2.cpp
View File

@ -1263,7 +1263,6 @@ void RasterizerGLES2::texture_set_flags(RID p_texture,uint32_t p_flags) {
p_flags&=VS::TEXTURE_FLAG_FILTER;//can change only filter p_flags&=VS::TEXTURE_FLAG_FILTER;//can change only filter
} }
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(texture->target, texture->tex_id); glBindTexture(texture->target, texture->tex_id);
uint32_t cube = texture->flags & VS::TEXTURE_FLAG_CUBEMAP; uint32_t cube = texture->flags & VS::TEXTURE_FLAG_CUBEMAP;

4
scene/gui/texture_frame.cpp
View File

@ -88,8 +88,8 @@ void TextureFrame::set_texture(const Ref<Texture>& p_tex) {
texture=p_tex; texture=p_tex;
update(); update();
if (texture.is_valid()) //if (texture.is_valid())
texture->set_flags(texture->get_flags()&(~Texture::FLAG_REPEAT)); //remove repeat from texture, it looks bad in sprites // texture->set_flags(texture->get_flags()&(~Texture::FLAG_REPEAT)); //remove repeat from texture, it looks bad in sprites
minimum_size_changed(); minimum_size_changed();
} }