Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 22:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Browse source 
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
This commit is contained in:
Rémi Verschelde 2017-01-02 21:38:20 +01:00
commit 3f3f5a5359
287 changed files with 59481 additions and 17904 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/editor/plugins/sample_library_editor_plugin.cpp
View file

@ -236,7 +236,7 @@ void SampleLibraryEditor::_update_library() {
// Preview/edit
Ref<ImageTexture> preview( memnew( ImageTexture ));
preview->create(128,16,Image::FORMAT_RGB);
preview->create(128,16,Image::FORMAT_RGB8);
SampleEditor::generate_preview_texture(smp,preview);
ti->set_cell_mode(1,TreeItem::CELL_MODE_ICON);
ti->set_selectable(1,false);