Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-05-08 07:53:48 +02:00
commit 6f57d12e2e
1 changed files with 0 additions and 20 deletions

View 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