[Bf-blender-cvs] [823ebbae650] temp-dna-rename: Minor edits

Campbell Barton noreply at git.blender.org
Tue Feb 12 22:11:20 CET 2019


Commit: 823ebbae6503c57099f60fda6ca912d366ec383d
Author: Campbell Barton
Date:   Wed Feb 13 00:15:41 2019 +1100
Branches: temp-dna-rename
https://developer.blender.org/rB823ebbae6503c57099f60fda6ca912d366ec383d

Minor edits

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

M	source/blender/makesdna/DNA_genfile.h
M	source/blender/makesdna/intern/dna_genfile.c
M	source/blender/makesdna/intern/dna_utils.c
M	source/blender/makesrna/intern/rna_define.c

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

diff --git a/source/blender/makesdna/DNA_genfile.h b/source/blender/makesdna/DNA_genfile.h
index b46ec446791..0d330c8999a 100644
--- a/source/blender/makesdna/DNA_genfile.h
+++ b/source/blender/makesdna/DNA_genfile.h
@@ -90,7 +90,6 @@ void               DNA_sdna_current_free(void);
 
 int DNA_struct_find_nr_ex(const struct SDNA *sdna, const char *str, unsigned int *index_last);
 int DNA_struct_find_nr(const struct SDNA *sdna, const char *str);
-
 void DNA_struct_switch_endian(const struct SDNA *oldsdna, int oldSDNAnr, char *data);
 const char *DNA_struct_get_compareflags(const struct SDNA *sdna, const struct SDNA *newsdna);
 void *DNA_struct_reconstruct(
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index ed5b00f1458..6b597ac3d6b 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -1454,7 +1454,8 @@ bool DNA_sdna_patch_struct_member(
 
 /**
  * Unique names are shared, which causes problems renaming.
- * Make sure every struct member gets it's own name so any renaming
+ * Make sure every struct member gets it's own name so renaming
+ * only ever impacts a single struct.
  */
 static void sdna_softpatch_runtime_expand_names(SDNA *sdna)
 {
diff --git a/source/blender/makesdna/intern/dna_utils.c b/source/blender/makesdna/intern/dna_utils.c
index 1ca290e73db..690ec42e321 100644
--- a/source/blender/makesdna/intern/dna_utils.c
+++ b/source/blender/makesdna/intern/dna_utils.c
@@ -107,7 +107,6 @@ uint DNA_elem_id_offset_end(const char *elem_dna)
 	return elem_dna_offset;
 }
 
-
 /**
  * Check if 'var' matches '*var[3]' for eg,
  * return true if it does, with start/end offsets.
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 4c074e189bf..ef455eb3688 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -588,7 +588,7 @@ BlenderRNA *RNA_create(void)
 		DefRNA.error = 1;
 	}
 
-	/* We need runtime and on-disk names. */
+	/* We need both runtime and static (on-disk) DNA names. */
 	DNA_sdna_softpatch_runtime_ensure(DefRNA.sdna);
 
 #ifndef RNA_RUNTIME



More information about the Bf-blender-cvs mailing list