diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 19:37:23 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 19:37:23 -0300 |
| commit | 680402cebf63066abcc93e7e8035e457c6305874 (patch) | |
| tree | dd6a7ad059beb33ea01640a53d0daab506378acc /tools/editor | |
| parent | c688b55019e485ddf66cd119173016ec6c8bd4e5 (diff) | |
Add missing icons, also make MSVC2010 happy
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/plugins/shader_graph_editor_plugin.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index 5da287aa69..1997b268a7 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -2413,12 +2413,21 @@ void ShaderGraphView::_create_node(int p_id) { Array colors; colors.push_back("Color"); colors.push_back("LightColor"); + colors.push_back("Light"); + colors.push_back("Diffuse"); + colors.push_back("Specular"); + colors.push_back("Emmision"); Array reals; reals.push_back("Alpha"); - reals.push_back("NormapMapDepth"); + reals.push_back("DiffuseAlpha"); + reals.push_back("NormalMapDepth"); reals.push_back("SpecExp"); + reals.push_back("Glow"); + reals.push_back("ShadeParam"); + reals.push_back("SpecularExp"); reals.push_back("LightAlpha"); reals.push_back("PointSize"); + reals.push_back("Discard"); int idx=0; for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) { @@ -2739,10 +2748,8 @@ const char* ShaderGraphEditor::node_names[ShaderGraph::NODE_TYPE_MAX]={ ShaderGraphEditor::ShaderGraphEditor(bool p_2d) { _2d=p_2d; - HBoxContainer *hbc = memnew( HBoxContainer ); popup = memnew( PopupMenu ); - hbc->add_child(popup); - add_child(hbc); + add_child(popup); tabs = memnew(TabContainer); |