godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases 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
parent db46a34418 2820b2d82b
commit 3f3f5a5359
287 changed files with 59481 additions and 17904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -3334,7 +3334,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
vp_base->set_v_size_flags(SIZE_EXPAND_FILL);
palette_split->add_child(vp_base);
Control *vp = memnew (Control);
ViewportContainer *vp = memnew (ViewportContainer);
vp->set_stretch(true);
vp_base->add_child(vp);
vp->set_area_as_parent_rect();
vp->add_child(p_editor->get_scene_root());
@@ -3688,7 +3689,7 @@ void CanvasItemEditorViewport::_create_preview(const Vector<String>& files) cons
Ref<ImageTexture> texture=Ref<ImageTexture> ( ResourceCache::get(path)->cast_to<ImageTexture>() );
Sprite* sprite=memnew(Sprite);
sprite->set_texture(texture);
sprite->set_opacity(0.7f);
sprite->set_modulate(Color(1,1,1,0.7f));
preview->add_child(sprite);
label->show();
label_desc->show();