[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30890] trunk/blender/source/blender: bugfix [#22660] Text Boxes properties are not animateable.

[Campbell Barton]

Revision: 30890
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30890
Author:   campbellbarton
Date:     2010-07-30 08:48:18 +0200 (Fri, 30 Jul 2010)

Log Message:
-----------
bugfix [#22660] Text Boxes properties are not animateable.
suggestion [#23093] Curve -> CurveMapping in brush...

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_brush.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2010-07-30 06:09:23 UTC (rev 30889)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2010-07-30 06:48:18 UTC (rev 30890)
@@ -731,7 +731,7 @@
 
 	prop= RNA_def_property(srna, "curve", PROP_POINTER, PROP_NONE);
 	RNA_def_property_flag(prop, PROP_NEVER_NULL);
-	RNA_def_property_ui_text(prop, "Curve", "Editable falloff curve");
+	RNA_def_property_ui_text(prop, "CurveMapping", "Editable falloff curve");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
 	/* texture */

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2010-07-30 06:09:23 UTC (rev 30889)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2010-07-30 06:48:18 UTC (rev 30890)
@@ -510,6 +510,18 @@
 		cu->actnu= BLI_findindex(nubase, nu);
 }
 
+static char *rna_TextBox_path(PointerRNA *ptr)
+{
+	Curve *cu= (Curve*)ptr->id.data;
+	TextBox *tb= ptr->data;
+	int index= (int)(tb - cu->tb);
+
+	if (index >= 0 && index < cu->totbox)
+		return BLI_sprintfN("textboxes[%d]", index);
+	else
+		return BLI_strdup("");
+}
+
 #else
 
 static void rna_def_bpoint(BlenderRNA *brna)
@@ -841,7 +853,6 @@
 	
 	srna= RNA_def_struct(brna, "TextBox", NULL);
 	RNA_def_struct_ui_text(srna, "Text Box", "Text bounding box for layout");
-	// XXX: still needs path function
 	
 	/* number values */
 	prop= RNA_def_property(srna, "x", PROP_FLOAT, PROP_NONE);
@@ -867,6 +878,8 @@
 	RNA_def_property_range(prop, 0.0f, 50.0f);
 	RNA_def_property_ui_text(prop, "Textbox Height", "");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
+	
+	RNA_def_struct_path_func(srna, "rna_TextBox_path");
 }
 
 static void rna_def_charinfo(BlenderRNA *brna)

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2010-07-30 06:09:23 UTC (rev 30889)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2010-07-30 06:48:18 UTC (rev 30890)
@@ -4803,7 +4803,7 @@
 	reg= RNA_struct_register(srna);
 
 	if(!reg) {
-		PyErr_SetString(PyExc_ValueError, "bpy.types.register(...): expected a Type subclassed from a registerable rna type (no register supported).");
+		PyErr_Format(PyExc_ValueError, "bpy.types.register(...): expected a subclass of a registerable rna type (%.200s does not support registration).", RNA_struct_identifier(srna));
 		return NULL;
 	}