diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-30 20:08:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 20:08:09 +0200 |
| commit | cffec896f9fc4c23cef448468ab50d45d4f04083 (patch) | |
| tree | 7ed0242729ad0125081917dd3e538dd86f85db27 /editor/collada | |
| parent | bbaf35c4f540033d51ed02c5541b2270da288fd0 (diff) | |
| parent | e2459479dea6a853bc180b182f1817ede4baa611 (diff) | |
Merge pull request #31801 from merumelu/editor-remove-tools-defined-guards
Editor: remove TOOLS_ENABLED guards
Diffstat (limited to 'editor/collada')
| -rw-r--r-- | editor/collada/collada.cpp | 4 | ||||
| -rw-r--r-- | editor/collada/collada.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index aea7f461f1..1bb49a4167 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -28,8 +28,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef TOOLS_ENABLED - #include "collada.h" #include <stdio.h> @@ -2576,5 +2574,3 @@ Error Collada::load(const String &p_path, int p_flags) { Collada::Collada() { } - -#endif diff --git a/editor/collada/collada.h b/editor/collada/collada.h index 9ed62b46b7..317c3f1d37 100644 --- a/editor/collada/collada.h +++ b/editor/collada/collada.h @@ -28,8 +28,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef TOOLS_ENABLED - #ifndef COLLADA_H #define COLLADA_H @@ -647,5 +645,3 @@ private: // private stuff }; #endif // COLLADA_H - -#endif |