[Bf-blender-cvs] [83b1f24] master: Fix Xcode link error, missing definitions in RNA C++ API that other compilers ignored.

Brecht Van Lommel noreply at git.blender.org
Sun Nov 20 18:15:26 CET 2016


Commit: 83b1f24140f63b35f93457d03f779b964ffad8ca
Author: Brecht Van Lommel
Date:   Sun Nov 20 17:46:29 2016 +0100
Branches: master
https://developer.blender.org/rB83b1f24140f63b35f93457d03f779b964ffad8ca

Fix Xcode link error, missing definitions in RNA C++ API that other compilers ignored.

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

M	source/blender/makesrna/intern/makesrna.c

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

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 569c1ee..309d39a 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -1536,7 +1536,11 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
 			const char *nextfunc = (const char *)cprop->next;
 			const char *item_type = (const char *)cprop->item_type;
 
-			if (dp->dnatype && STREQ(dp->dnatype, "ListBase")) {
+			if (cprop->length) {
+				/* always generate if we have a manual implementation */
+				cprop->length = (void *)rna_def_property_length_func(f, srna, prop, dp, (const char *)cprop->length);
+			}
+			else if (dp->dnatype && STREQ(dp->dnatype, "ListBase")) {
 				/* pass */
 			}
 			else if (dp->dnalengthname || dp->dnalengthfixed) {




More information about the Bf-blender-cvs mailing list