Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/particle.c

1 files changed, 12 insertions, 15 deletions

diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 4db98bda7dd..6a41591e051 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -632,13 +632,8 @@ static void recurs_test_compflags(const SDNA *sdna, char *compflags, int structn
 /**
  * Constructs and returns an array of byte flags with one element for each struct in oldsdna,
  * indicating how it compares to newsdna:
- *
- * flag value:
- * - 0  Struct has disappeared (values of this struct type will not be loaded by the current Blender)
- * - 1  Struct is the same (can be loaded with straight memory copy after any necessary endian conversion)
- * - 2  Struct is different in some way (needs to be copied/converted field by field)
  */
-char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna)
+const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna)
 {
 	int a, b;
 	const short *sp_old, *sp_new;
@@ -909,12 +904,12 @@ static int elem_strcmp(const char *name, const char *oname)
  * \param sppo  Optional place to return pointer to field info in sdna
  * \return Data address.
  */
-static char *find_elem(
+static const char *find_elem(
         const SDNA *sdna,
         const char *type,
         const char *name,
         const short *old,
-        char *olddata,
+        const char *olddata,
         const short **sppo)
 {
 	int a, elemcount, len;
@@ -1062,7 +1057,7 @@ static void reconstruct_struct(
         const char *compflags,
 
         int oldSDNAnr,
-        char *data,
+        const char *data,
         int curSDNAnr,
         char *cur)
 {
@@ -1073,7 +1068,8 @@ static void reconstruct_struct(
 	int a, elemcount, elen, eleno, mul, mulo, firststructtypenr;
 	const short *spo, *spc, *sppo;
 	const char *type;
-	char *cpo, *cpc;
+	const char *cpo;
+	char *cpc;
 	const char *name, *nameo;
 
 	unsigned int oldsdna_index_last = UINT_MAX;
@@ -1111,7 +1107,7 @@ static void reconstruct_struct(
 		if (spc[0] >= firststructtypenr && !ispointer(name)) {
 			/* struct field type */
 			/* where does the old struct data start (and is there an old one?) */
-			cpo = find_elem(oldsdna, type, name, spo, data, &sppo);
+			cpo = (char *)find_elem(oldsdna, type, name, spo, data, &sppo);
 			
 			if (cpo) {
 				oldSDNAnr = DNA_struct_find_nr_ex(oldsdna, type, &oldsdna_index_last);
@@ -1188,7 +1184,7 @@ void DNA_struct_switch_endian(const SDNA *oldsdna, int oldSDNAnr, char *data)
 		if (spc[0] >= firststructtypenr && !ispointer(name)) {
 			/* struct field type */
 			/* where does the old data start (is there one?) */
-			char *cpo = find_elem(oldsdna, type, name, spo, data, NULL);
+			char *cpo = (char *)find_elem(oldsdna, type, name, spo, data, NULL);
 			if (cpo) {
 				oldSDNAnr = DNA_struct_find_nr_ex(oldsdna, type, &oldsdna_index_last);
 				
@@ -1250,11 +1246,12 @@ void DNA_struct_switch_endian(const SDNA *oldsdna, int oldSDNAnr, char *data)
  */
 void *DNA_struct_reconstruct(
         const SDNA *newsdna, const SDNA *oldsdna,
-        char *compflags, int oldSDNAnr, int blocks, void *data)
+        const char *compflags, int oldSDNAnr, int blocks, const void *data)
 {
 	int a, curSDNAnr, curlen = 0, oldlen;
 	const short *spo, *spc;
-	char *cur, *cpc, *cpo;
+	char *cur, *cpc;
+	const char *cpo;
 	const char *type;
 	
 	/* oldSDNAnr == structnr, we're looking for the corresponding 'cur' number */
@@ -1297,7 +1294,7 @@ int DNA_elem_offset(SDNA *sdna, const char *stype, const char *vartype, const ch
 	return (int)((intptr_t)cp);
 }
 
-bool DNA_struct_elem_find(SDNA *sdna, const char *stype, const char *vartype, const char *name)
+bool DNA_struct_elem_find(const SDNA *sdna, const char *stype, const char *vartype, const char *name)
 {
 	const int SDNAnr = DNA_struct_find_nr(sdna, stype);