diff options
| author | Juan Linietsky | 2016-10-10 18:31:01 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-10-10 18:31:01 -0300 |
| commit | 1527cf8c0d17891dd0ebf99d484f83daa46eba3c (patch) | |
| tree | a9a0fc5a00f8f57a973f2861d051b76f99642114 /core | |
| parent | 850eaf7ed796d2f2d9a35c6bc4ba9a4e69f5ca1d (diff) | |
| download | godot-1527cf8c0d17891dd0ebf99d484f83daa46eba3c.tar.gz godot-1527cf8c0d17891dd0ebf99d484f83daa46eba3c.tar.zst godot-1527cf8c0d17891dd0ebf99d484f83daa46eba3c.zip | |
Diffstat (limited to 'core')
| -rw-r--r-- | core/error_macros.h | 3 | ||||
| -rw-r--r-- | core/os/os.cpp | 1 | ||||
| -rw-r--r-- | core/os/os.h | 3 | ||||
| -rw-r--r-- | core/pair.h | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/core/error_macros.h b/core/error_macros.h index 6d931e899..b65682746 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -49,7 +49,8 @@ enum ErrorHandlerType { ERR_HANDLER_ERROR, ERR_HANDLER_WARNING, - ERR_HANDLER_SCRIPT + ERR_HANDLER_SCRIPT, + ERR_HANDLER_SHADER, }; typedef void (*ErrorHandlerFunc)(void*,const char*,const char*,int p_line,const char *, const char *,ErrorHandlerType p_type); diff --git a/core/os/os.cpp b/core/os/os.cpp index ee3247623..43956809e 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -68,6 +68,7 @@ void OS::print_error(const char* p_function,const char* p_file,int p_line,const case ERR_ERROR: err_type="**ERROR**"; break; case ERR_WARNING: err_type="**WARNING**"; break; case ERR_SCRIPT: err_type="**SCRIPT ERROR**"; break; + case ERR_SHADER: err_type="**SHADER ERROR**"; break; } if (p_rationale && *p_rationale) diff --git a/core/os/os.h b/core/os/os.h index c2b46a542..d939198bf 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -120,7 +120,8 @@ public: enum ErrorType { ERR_ERROR, ERR_WARNING, - ERR_SCRIPT + ERR_SCRIPT, + ERR_SHADER }; virtual void print_error(const char* p_function,const char* p_file,int p_line,const char *p_code,const char*p_rationale,ErrorType p_type=ERR_ERROR); diff --git a/core/pair.h b/core/pair.h index 9bffc37f4..b5208016e 100644 --- a/core/pair.h +++ b/core/pair.h @@ -34,6 +34,9 @@ struct Pair { F first; S second; + + Pair() {} + Pair( F p_first, S p_second) { first=p_first; second=p_second; } }; #endif // PAIR_H |