godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +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

3
tools/editor/plugins/mesh_editor_plugin.h
View File

@@ -29,6 +29,8 @@
#ifndef MESH_EDITOR_PLUGIN_H
#define MESH_EDITOR_PLUGIN_H
#if 0
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_node.h"
#include "scene/resources/material.h"
@@ -93,3 +95,4 @@ public:
};
#endif // MESH_EDITOR_PLUGIN_H
#endif