Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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

4
tools/editor/plugins/shader_graph_editor_plugin.cpp
View file

@ -28,6 +28,7 @@
/*************************************************************************/
#include "shader_graph_editor_plugin.h"
#if 0
#include "scene/gui/check_box.h"
#include "scene/gui/menu_button.h"
@ -1377,7 +1378,7 @@ ToolButton *ShaderGraphView::make_editor(String text,GraphNode* gn,int p_id,int
edit->set_icon(ped_popup->get_icon("Matrix", "EditorIcons"));
break;
case Variant::COLOR: {
Image icon_color = Image(15,15,false,Image::FORMAT_RGB);
Image icon_color = Image(15,15,false,Image::FORMAT_RGB8);
Color c = graph->default_get_value(type,p_id,param);
for (int x=1;x<14;x++)
for (int y=1;y<14;y++)
@ -2945,3 +2946,4 @@ ShaderGraphEditorPlugin::~ShaderGraphEditorPlugin()
#endif