[Bf-blender-cvs] [e657a4af13a] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: e657a4af13a98b022cb695a9cf00ff02dcc3b524
Author: Campbell Barton
Date:   Sun Jun 3 15:20:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe657a4af13a98b022cb695a9cf00ff02dcc3b524

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_screen.h
index 722a36c9f1d,2316340f65e..c560e4d4de1
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@@ -77,26 -71,23 +77,26 @@@ typedef struct SpaceType 
  	int spaceid;                                /* unique space identifier */
  	int iconid;                                 /* icon lookup for menus */
  	
 -	/* initial allocation, after this WM will call init() too */
 -	struct SpaceLink    *(*new)(const struct bContext *C);
 +	/* Initial allocation, after this WM will call init() too. Some editors need
 +	 * area and scene data (e.g. frame range) to set their initial scrolling. */
- 	struct SpaceLink    *(*new)(const struct ScrArea *, const struct Scene *);
++	struct SpaceLink *(*new)(const struct ScrArea *sa, const struct Scene *scene);
  	/* not free spacelink itself */
- 	void (*free)(struct SpaceLink *);
+ 	void (*free)(struct SpaceLink *sl);
  	
  	/* init is to cope with file load, screen (size) changes, check handlers */
- 	void (*init)(struct wmWindowManager *, struct ScrArea *);
+ 	void (*init)(struct wmWindowManager *wm, struct ScrArea *sa);
  	/* exit is called when the area is hidden or removed */
- 	void (*exit)(struct wmWindowManager *, struct ScrArea *);
+ 	void (*exit)(struct wmWindowManager *wm, struct ScrArea *sa);
  	/* Listeners can react to bContext changes */
- 	void (*listener)(struct bScreen *sc, struct ScrArea *,
- 	                 struct wmNotifier *, struct Scene *scene,
 -	void (*listener)(struct bScreen *sc, struct ScrArea *sa, struct wmNotifier *wmn);
++	void (*listener)(struct bScreen *sc, struct ScrArea *sa,
++	                 struct wmNotifier *wmn, struct Scene *scene,
 +	                 struct WorkSpace *workspace);
  	
  	/* refresh context, called after filereads, ED_area_tag_refresh() */
- 	void (*refresh)(const struct bContext *, struct ScrArea *);
+ 	void (*refresh)(const struct bContext *C, struct ScrArea *sa);
  	
  	/* after a spacedata copy, an init should result in exact same situation */
- 	struct SpaceLink    *(*duplicate)(struct SpaceLink *);
+ 	struct SpaceLink *(*duplicate)(struct SpaceLink *sl);
  
  	/* register operator types on startup */
  	void (*operatortypes)(void);
@@@ -105,19 -96,12 +105,19 @@@
  	/* on startup, define dropboxes for spacetype+regions */
  	void (*dropboxes)(void);
  
 +	/* initialize manipulator-map-types and manipulator-group-types with the region */
 +	void (*manipulators)(void);
 +
  	/* return context data */
- 	int (*context)(const struct bContext *, const char *, struct bContextDataResult *);
+ 	int (*context)(const struct bContext *C, const char *member, struct bContextDataResult *result);
  
  	/* Used when we want to replace an ID by another (or NULL). */
- 	void (*id_remap)(struct ScrArea *, struct SpaceLink *, struct ID *, struct ID *);
+ 	void (*id_remap)(struct ScrArea *sa, struct SpaceLink *sl, struct ID *old_id, struct ID *new_id);
  
 +	int  (*space_subtype_get)(struct ScrArea *sa);
 +	void (*space_subtype_set)(struct ScrArea *sa, int value);
 +	void (*space_subtype_item_extend)(struct bContext *C, EnumPropertyItem **item, int *totitem);
 +
  	/* region type definitions */
  	ListBase regiontypes;
  	
@@@ -139,29 -123,18 +139,29 @@@ typedef struct ARegionType 
  	int regionid;           /* unique identifier within this space, defines RGN_TYPE_xxxx */
  	
  	/* add handlers, stuff you only do once or on area/region type/size changes */
- 	void (*init)(struct wmWindowManager *, struct ARegion *);
+ 	void (*init)(struct wmWindowManager *wm, struct ARegion *ar);
  	/* exit is called when the region is hidden or removed */
- 	void (*exit)(struct wmWindowManager *, struct ARegion *);
+ 	void (*exit)(struct wmWindowManager *wm, struct ARegion *ar);
  	/* draw entirely, view changes should be handled here */
- 	void (*draw)(const struct bContext *, struct ARegion *);
+ 	void (*draw)(const struct bContext *wm, struct ARegion *ar);
 +	/* optional, compute button layout before drawing for dynamic size */
- 	void (*layout)(const struct bContext *, struct ARegion *);
++	void (*layout)(const struct bContext *C, struct ARegion *ar);
 +	/* snap the size of the region (can be NULL for no snapping). */
 +	int (*snap_size)(const struct ARegion *ar, int size, int axis);
  	/* contextual changes should be handled here */
- 	void (*listener)(struct bScreen *, struct ScrArea *, struct ARegion *,
- 	                 struct wmNotifier *, const struct Scene *scene);
 -	void (*listener)(struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar, struct wmNotifier *wmn);
 -	
 -	void (*free)(struct ARegion *ar);
++	void (*listener)(struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar,
++	                 struct wmNotifier *wmn, const struct Scene *scene);
 +	/* Optional callback to generate subscriptions. */
 +	void (*message_subscribe)(
 +	        const struct bContext *C,
 +	        struct WorkSpace *workspace, struct Scene *scene,
 +	        struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar,
 +	        struct wmMsgBus *mbus);
 +
 +	void (*free)(struct ARegion *);
  
  	/* split region, copy data optionally */
- 	void        *(*duplicate)(void *);
+ 	void *(*duplicate)(void *poin);
  
  	
  	/* register operator types on startup */
@@@ -254,10 -230,9 +258,10 @@@ typedef struct HeaderType 
  
  	char idname[BKE_ST_MAXNAME];        /* unique name */
  	int space_type;
 +	int region_type;
  
  	/* draw entirely, view changes should be handled here */
- 	void (*draw)(const struct bContext *, struct Header *);
+ 	void (*draw)(const struct bContext *C, struct Header *header);
  
  	/* RNA integration */
  	ExtensionRNA ext;