Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2018 05:53:48 +0000 (07:53 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2018 05:53:48 +0000 (07:53 +0200)
source/blender/windowmanager/WM_types.h

index bbd12ddfb0afad7c7828fae466815fc2a83a1fce..ffd2a036ffb4ae70b0bc4003b3c46e75ae41f9be 100644 (file)
@@ -635,26 +635,6 @@ typedef struct wmIMEData {
 
 typedef void (*wmPaintCursorDraw)(struct bContext *C, int, int, void *customdata);
 
-
-/* ****************** Messages ********************* */
-
-enum {
-       WM_LOG_DEBUG                            = 0,
-       WM_LOG_INFO                                     = 1000,
-       WM_LOG_WARNING                          = 2000,
-       WM_ERROR_UNDEFINED                      = 3000,
-       WM_ERROR_INVALID_INPUT          = 3001,
-       WM_ERROR_INVALID_CONTEXT        = 3002,
-       WM_ERROR_OUT_OF_MEMORY          = 3003
-};
-
-typedef struct wmReport {
-       struct wmReport *next, *prev;
-       const char *typestr;
-       char *message;
-       int type;
-} wmReport;
-
 /* *************** Drag and drop *************** */
 
 #define WM_DRAG_ID             0