RNA

* Work around bScreen/Screen DNA name patching, so bScreen does not
  require manual callbacks to be written for properties.
* Added SpaceLink and SpaceImage RNA.
* Fix issue initializing ID property arrays with default values.

DNA
* Some DNA changes for space image.
* And a fix for corrupt clone image pointer in reading brushes.

2 files changed, 19 insertions, 21 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1a6fa00c841..e322da88438 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -431,6 +431,8 @@ typedef struct ToolSettings {
 	short uvcalc_mapdir;
 	short uvcalc_mapalign;
 	short uvcalc_flag;
+	short uv_flag, uv_selectmode;
+	short uv_pad[2];
 
 	/* Auto-IK */
 	short autoik_chainlen;
@@ -838,6 +840,16 @@ typedef struct Scene {
 #define UVCALC_NO_ASPECT_CORRECT	2	/* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
 #define UVCALC_TRANSFORM_CORRECT	4	/* adjust UV's while transforming to avoid distortion */
 
+/* toolsettings->uv_flag */
+#define UV_SYNC_SELECTION	1
+#define UV_SHOW_SAME_IMAGE	2
+
+/* toolsettings->uv_selectmode */
+#define UV_SELECT_VERTEX	0
+#define UV_SELECT_EDGE		1 /* not implemented */
+#define UV_SELECT_FACE		2
+#define UV_SELECT_ISLAND	3
+
 /* toolsettings->edge_mode */
 #define EDGE_MODE_SELECT				0
 #define EDGE_MODE_TAG_SEAM				1
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index dc1f0827c5c..45383f2fa34 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -222,30 +222,26 @@ typedef struct SpaceImage {
 	SpaceLink *next, *prev;
 	ListBase regionbase;		/* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale;
 
+	float blockscale;
 	short blockhandler[8];
-
-	View2D v2d; /* depricated, copied to region */
 	
 	struct Image *image;
 	struct ImageUser iuser;
 	
 	struct CurveMapping *cumap;
-	short mode, menunr;
-	short imanr;
+	short menunr, imanr, pad2;
 	short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */
 	int flag;
-	short selectmode;
 	short imtypenr, lock;
-	short pin;
-	float zoom;
+	short pin, pad3;
 	char dt_uv; /* UV draw type */
 	char sticky; /* sticky selection type */
 	char dt_uvstretch;
-	char pad[5];
+	char pad;
 	
 	float xof, yof;					/* user defined offset, image is centered */
+	float zoom, pad4;				/* user defined zoom level */
 	float centx, centy;				/* storage for offset while render drawing */
 	
 	struct bGPdata *gpd;			/* grease pencil data */
@@ -544,10 +540,6 @@ typedef struct SpaceImaSel {
 #define MOVIEFILE_ICON		1024 /* movie file that preview can't load */
 #define FOLDERFILE			2048 /* represents folders for filtering */
 
-/* SpaceImage->mode */
-#define SI_TEXTURE		0
-#define SI_SHOW			1
-
 /* SpaceImage->dt_uv */
 #define SI_UVDT_OUTLINE	0
 #define SI_UVDT_DASH	1
@@ -565,12 +557,6 @@ typedef struct SpaceImaSel {
 #define SI_STICKY_DISABLE	1
 #define SI_STICKY_VERTEX	2
 
-/* SpaceImage->selectmode */
-#define SI_SELECT_VERTEX	0
-#define SI_SELECT_EDGE		1 /* not implemented */
-#define SI_SELECT_FACE		2
-#define SI_SELECT_ISLAND	3
-
 /* SpaceImage->flag */
 #define SI_BE_SQUARE	1<<0
 #define SI_EDITTILE		1<<1
@@ -590,8 +576,8 @@ typedef struct SpaceImaSel {
 		/* next two for render window dislay */
 #define SI_PREVSPACE	1<<15
 #define SI_FULLWINDOW	1<<16
-#define SI_SYNC_UVSEL	1<<17
-#define SI_LOCAL_UV		1<<18
+#define SI_DEPRECATED4	1<<17
+#define SI_DEPRECATED5	1<<18
 		/* this means that the image is drawn until it reaches the view edge,
 		 * in the image view, its unrelated to the 'tile' mode for texface */
 #define SI_DRAW_TILE	1<<19