diff options
| author | Rémi Verschelde | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /tools/editor/plugins/particles_editor_plugin.cpp | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
| download | godot-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.gz godot-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.zst godot-3f3f5a5359973e95e94148676a9793d6f52468f3.zip | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'tools/editor/plugins/particles_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/particles_editor_plugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp index 0fe03e49b..b17867ffd 100644 --- a/tools/editor/plugins/particles_editor_plugin.cpp +++ b/tools/editor/plugins/particles_editor_plugin.cpp @@ -26,6 +26,8 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + +#if 0 #include "particles_editor_plugin.h" #include "io/resource_loader.h" #include "servers/visual/particle_system_sw.h" @@ -456,3 +458,4 @@ ParticlesEditorPlugin::~ParticlesEditorPlugin() } +#endif |