Merged changes in the trunk up to revision 48893.

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

6 files changed, 35 insertions, 29 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index fb6ae8e3833..58964a16aee 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -108,7 +108,7 @@ typedef struct ID {
 	void *next, *prev;
 	struct ID *newid;
 	struct Library *lib;
-	char name[66];
+	char name[66]; /* MAX_ID_NAME */
 	short pad, us;
 	/**
 	 * LIB_... flags report on status of the datablock this ID belongs
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index d28a14a9fd6..c4258c0870e 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -362,13 +362,14 @@ typedef struct MVertSkin {
 
 
 /* mtface->unwrap */
-#define TF_DEPRECATED1	1
-#define TF_DEPRECATED2	2
-#define TF_DEPRECATED3	4
-#define TF_DEPRECATED4	8
-#define TF_PIN1		    16
-#define TF_PIN2		    32
-#define TF_PIN3	   		64
-#define TF_PIN4	    	128
+#define TF_DEPRECATED1     1
+#define TF_DEPRECATED2     2
+#define TF_DEPRECATED3     4
+#define TF_DEPRECATED4     8
+#define TF_PIN1            16
+#define TF_PIN2	           32
+#define TF_PIN3	   	       64
+#define TF_PIN4	           128
+#define TF_CORRECT_ASPECT  256
 
 #endif
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index e4b5a264ba3..1e2f6eabce6 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -178,9 +178,7 @@ typedef struct bNode {
 	char label[64];			/* custom user-defined label, MAX_NAME */
 	short custom1, custom2;	/* to be abused for buttons */
 	float custom3, custom4;
-	int highlight;			/* 0 = not highlighted, 1-N = highlighted*/
-	int pad;
-	
+
 	short need_exec, exec;	/* need_exec is set as UI execution event, exec is flag during exec */
 	void *threaddata;		/* optional extra storage for use in thread (read only then!) */
 	rctf totr;				/* entire boundbox */
@@ -654,6 +652,7 @@ typedef struct NodeKeyingScreenData {
 typedef struct NodeKeyingData {
 	float screen_balance;
 	float despill_factor;
+	float despill_balance;
 	int edge_kernel_radius;
 	float edge_kernel_tolerance;
 	float clip_black, clip_white;
@@ -663,6 +662,11 @@ typedef struct NodeKeyingData {
 	int blur_pre, blur_post;
 } NodeKeyingData;
 
+typedef struct NodeTrackPosData {
+	char tracking_object[64];
+	char track_name[64];
+} NodeTrackPosData;
+
 /* frame node flags */
 #define NODE_FRAME_SHRINK		1	/* keep the bounding box minimal */
 #define NODE_FRAME_RESIZEABLE	2	/* test flag, if frame can be resized by user */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index b3f0950fa75..7e1094ef93b 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -518,7 +518,7 @@ typedef enum eSpaceSeq_Proxy_RenderSize {
 
 /* Config and Input for File Selector */
 typedef struct FileSelectParams {
-	char title[32]; /* title, also used for the text of the execute button */
+	char title[96]; /* title, also used for the text of the execute button */
 	char dir[1056]; /* directory, FILE_MAX_LIBEXTRA, 1024 + 32, this is for extreme case when 1023 length path
 	                 * needs to be linked in, where foo.blend/Armature need adding  */
 	char file[256]; /* file */
@@ -856,10 +856,10 @@ typedef struct SpaceNode {
 	
 	struct ID *id, *from;       /* context, no need to save in file? well... pinning... */
 	short flag, pad1;           /* menunr: browse id block in header */
-	float aspect;
+	float aspect, aspect_sqrt;
 	
 	float xof, yof;     /* offset for drawing the backdrop */
-	float zoom, padf;   /* zoom for backdrop */
+	float zoom;   /* zoom for backdrop */
 	float mx, my;       /* mousepos for drawing socketless link */
 	
 	struct bNodeTree *nodetree, *edittree;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 8690d0a26e4..fc0ce20e0c9 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -348,6 +348,7 @@ typedef struct UserDef {
 	char textudir[768];
 	char pythondir[768];
 	char sounddir[768];
+	char i18ndir[768];
 	char image_editor[1024];	/* 1024 = FILE_MAX */
 	char anim_player[1024];	/* 1024 = FILE_MAX */
 	int anim_player_preset;
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index f8c0f6a5910..ab320322f83 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -64,8 +64,8 @@
 /* headers around with more freedom.                                         */
 static const char *includefiles[] = {
 
-	// if you add files here, please add them at the end
-	// of makesdna.c (this file) as well
+	/* if you add files here, please add them at the end
+	 * of makesdna.c (this file) as well */
 
 	"DNA_listBase.h",
 	"DNA_vec_types.h",
@@ -80,8 +80,8 @@ static const char *includefiles[] = {
 	"DNA_lamp_types.h",
 	"DNA_material_types.h",
 	"DNA_vfont_types.h",
-	// if you add files here, please add them at the end
-	// of makesdna.c (this file) as well
+	/* if you add files here, please add them at the end
+	 * of makesdna.c (this file) as well */
 	"DNA_meta_types.h",
 	"DNA_curve_types.h",
 	"DNA_mesh_types.h",
@@ -122,8 +122,8 @@ static const char *includefiles[] = {
 	"DNA_particle_types.h",
 	"DNA_cloth_types.h",
 	"DNA_gpencil_types.h",
-	// if you add files here, please add them at the end
-	// of makesdna.c (this file) as well
+	/* if you add files here, please add them at the end
+	 * of makesdna.c (this file) as well */
 	"DNA_windowmanager_types.h",
 	"DNA_anim_types.h",
 	"DNA_boid_types.h",
@@ -136,7 +136,7 @@ static const char *includefiles[] = {
 	"DNA_freestyle_types.h",
 	"DNA_linestyle_types.h",
 
-	// empty string to indicate end of includefiles
+	/* empty string to indicate end of includefiles */
 	""
 };
 
@@ -452,7 +452,7 @@ static int preprocess_include(char *maindata, int len)
 
 	memcpy(temp, maindata, len);
 	
-	// remove all c++ comments
+	/* remove all c++ comments */
 	/* replace all enters/tabs/etc with spaces */
 	cp = temp;
 	a = len;
@@ -831,8 +831,8 @@ static int calculate_structlens(int firststruct)
 				else {
 					typelens[structtype] = len;
 					alphalens[structtype] = alphalen;
-					// two ways to detect if a struct contains a pointer:
-					// has_pointer is set or alphalen != len
+					/* two ways to detect if a struct contains a pointer:
+					 * has_pointer is set or alphalen != len */
 					if (has_pointer || alphalen != len) {
 						if (alphalen % 8) {
 							printf("Sizeerror 8 in struct: %s (add %d bytes)\n", types[structtype], alphalen % 8);
@@ -974,7 +974,7 @@ static int make_structDNA(char *baseDirectory, FILE *file)
 	add_type("uint64_t", 8); /* SDNA_TYPE_UINT64 */
 	add_type("void", 0);     /* SDNA_TYPE_VOID */
 
-	// the defines above shouldn't be output in the padding file...
+	/* the defines above shouldn't be output in the padding file... */
 	firststruct = nr_types;
 	
 	/* add all include files defined in the global array                     */
@@ -992,7 +992,7 @@ static int make_structDNA(char *baseDirectory, FILE *file)
 	if (debugSDNA) printf("\tFinished scanning %d headers.\n", i); 
 
 	if (calculate_structlens(firststruct)) {
-		// error
+		/* error */
 		return(1);
 	}
 
@@ -1093,7 +1093,7 @@ static int make_structDNA(char *baseDirectory, FILE *file)
 			if (fp == NULL) ;
 			else {
 
-				// add all include files defined in the global array
+				/* add all include files defined in the global array */
 				for (i = 0; strlen(includefiles[i]); i++) {
 					fprintf(fp, "#include \"%s%s\"\n", baseDirectory, includefiles[i]);
 				}
@@ -1170,7 +1170,7 @@ int main(int argc, char **argv)
 
 			fprintf(file, "unsigned char DNAstr[]= {\n");
 			if (make_structDNA(baseDirectory, file)) {
-				// error
+				/* error */
 				fclose(file);
 				make_bad_file(argv[1], __LINE__);
 				return_status = 1;