[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33952] trunk/blender/source/blender/ makesrna/intern: Fix for bug #25367 didn't ensure the problem wasn' t happening elsewhere.

Campbell Barton ideasman42 at gmail.com
Thu Dec 30 13:50:45 CET 2010


Revision: 33952
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33952
Author:   campbellbarton
Date:     2010-12-30 13:50:44 +0100 (Thu, 30 Dec 2010)

Log Message:
-----------
Fix for bug #25367 didn't ensure the problem wasn't happening elsewhere.

add a check in makesrna, found FollowPathConstraint.offset was a float wrapped as an int.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_constraint.c

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c	2010-12-30 12:22:28 UTC (rev 33951)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c	2010-12-30 12:50:44 UTC (rev 33952)
@@ -45,6 +45,8 @@
 #endif
 #endif
 
+static const char *rna_property_typename(PropertyType type);
+
 /* Replace if different */
 #define TMP_EXT ".tmp"
 
@@ -644,6 +646,13 @@
 			}
 			return NULL;
 		}
+
+		/* error check to ensure floats are not wrapped as ints/bools */
+		if(dp->dnatype && (strcmp(dp->dnatype, "float") == 0 || strcmp(dp->dnatype, "double") == 0) && prop->type != PROP_FLOAT) {
+			fprintf(stderr, "rna_def_property_set_func: %s.%s is a float but wrapped as type '%s'.\n", srna->identifier, prop->identifier, rna_property_typename(prop->type));
+			DefRNA.error= 1;
+			return NULL;
+		}
 	}
 
 	func= rna_alloc_function_name(srna->identifier, prop->identifier, "set");

Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_constraint.c	2010-12-30 12:22:28 UTC (rev 33951)
+++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c	2010-12-30 12:50:44 UTC (rev 33952)
@@ -1113,7 +1113,7 @@
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update");
 
-	prop= RNA_def_property(srna, "offset", PROP_INT, PROP_TIME);
+	prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_TIME);
 	RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
 	RNA_def_property_ui_text(prop, "Offset", "Offset from the position corresponding to the time frame");
 	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");





More information about the Bf-blender-cvs mailing list