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)
1  2 
source/blender/windowmanager/WM_types.h

index bbd12ddfb0afad7c7828fae466815fc2a83a1fce,7892e71ab11037ed32eb8c6c58089542a13ccb50..ffd2a036ffb4ae70b0bc4003b3c46e75ae41f9be
@@@ -109,22 -109,16 +109,22 @@@ extern "C" 
  struct bContext;
  struct wmEvent;
  struct wmWindowManager;
 +struct wmMsgBus;
  struct wmOperator;
  struct ImBuf;
  
  #include "RNA_types.h"
  #include "DNA_listBase.h"
 +#include "DNA_vec_types.h"
  #include "BLI_compiler_attrs.h"
  
  /* exported types for WM */
  #include "wm_cursors.h"
  #include "wm_event_types.h"
 +#include "manipulators/WM_manipulator_types.h"
 +
 +/* Include external manipulator API's */
 +#include "manipulators/WM_manipulator_api.h"
  
  /* ************** wmOperatorType ************************ */
  
@@@ -166,12 -160,6 +166,12 @@@ enum 
        WM_OP_EXEC_SCREEN
  };
  
 +/* property tags for RNA_OperatorProperties */
 +typedef enum eOperatorPropTags {
 +      OP_PROP_TAG_ADVANCED = (1 << 0),
 +} eOperatorPropTags;
 +#define OP_PROP_TAG_ADVANCED ((eOperatorPropTags)OP_PROP_TAG_ADVANCED)
 +
  /* ************** wmKeyMap ************************ */
  
  /* modifier */
@@@ -215,6 -203,7 +215,6 @@@ typedef struct wmNotifier 
        struct wmWindowManager *wm;
        struct wmWindow *window;
        
 -      int swinid;                     /* can't rely on this, notifiers can be added without context, swinid of 0 */
        unsigned int category, data, subtype, action;
        
        void *reference;
  #define NOTE_CATEGORY         0xFF000000
  #define       NC_WM                           (1<<24)
  #define       NC_WINDOW                       (2<<24)
 -#define       NC_SCREEN                       (3<<24)
 +#define NC_SCREEN                     (3<<24)
  #define       NC_SCENE                        (4<<24)
  #define       NC_OBJECT                       (5<<24)
  #define       NC_MATERIAL                     (6<<24)
  #define ND_JOB                                (5<<16)
  #define ND_UNDO                               (6<<16)
  
 -      /* NC_SCREEN screen */
 -#define ND_SCREENBROWSE               (1<<16)
 -#define ND_SCREENDELETE               (2<<16)
 +      /* NC_SCREEN */
 +#define ND_LAYOUTBROWSE               (1<<16)
 +#define ND_LAYOUTDELETE               (2<<16)
  #define ND_SCREENCAST         (3<<16)
  #define ND_ANIMPLAY                   (4<<16)
  #define ND_GPENCIL                    (5<<16)
  #define ND_EDITOR_CHANGED     (6<<16) /*sent to new editors after switching to them*/
 -#define ND_SCREENSET          (7<<16)
 +#define ND_LAYOUTSET          (7<<16)
  #define ND_SKETCH                     (8<<16)
 +#define ND_WORKSPACE_SET      (9<<16)
 +#define ND_WORKSPACE_DELETE (10<<16)
  
        /* NC_SCENE Scene */
  #define ND_SCENEBROWSE                (1<<16)
@@@ -423,7 -410,7 +423,7 @@@ typedef struct wmGesture 
        struct wmGesture *next, *prev;
        int event_type; /* event->type */
        int type;               /* gesture type define */
 -      int swinid;             /* initial subwindow id where it started */
 +      rcti winrct;    /* bounds of region to draw gesture within */
        int points;             /* optional, amount of points stored */
        int points_alloc;       /* optional, maximum amount of points stored */
        int modal_state;
@@@ -635,26 -622,6 +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
@@@ -739,7 -706,6 +719,7 @@@ extern struct CLG_LogRef *WM_LOG_OPERAT
  extern struct CLG_LogRef *WM_LOG_HANDLERS;
  extern struct CLG_LogRef *WM_LOG_EVENTS;
  extern struct CLG_LogRef *WM_LOG_KEYMAPS;
 +extern struct CLG_LogRef *WM_LOG_TOOLS;
  
  
  #ifdef __cplusplus