[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26760] trunk/blender/source/blender: rename Nurb to Spline in RNA since Nurb also stores bezier and poly lines.
Campbell Barton
ideasman42 at gmail.com
Wed Feb 10 09:53:09 CET 2010
Revision: 26760
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26760
Author: campbellbarton
Date: 2010-02-10 09:53:08 +0100 (Wed, 10 Feb 2010)
Log Message:
-----------
rename Nurb to Spline in RNA since Nurb also stores bezier and poly lines.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_curve.c
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2010-02-10 03:41:20 UTC (rev 26759)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2010-02-10 08:53:08 UTC (rev 26760)
@@ -180,7 +180,7 @@
/* correct vgroup indices because the number of vgroups is being reduced. */
int *remap= MEM_mallocN(sizeof(int) * (totdef + 1), "ED_vgroup_copy_array");
for(i=0; i<=totdef_from; i++) remap[i]= i;
- for(; i<=totdef; i++) remap[i]= 0; /* cany use these, so disable */
+ for(; i<=totdef; i++) remap[i]= 0; /* can't use these, so disable */
vgroup_remap_update_users(ob, remap);
MEM_freeN(remap);
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2010-02-10 03:41:20 UTC (rev 26759)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2010-02-10 08:53:08 UTC (rev 26760)
@@ -53,8 +53,8 @@
extern StructRNA RNA_AndController;
extern StructRNA RNA_AnimData;
extern StructRNA RNA_AnimViz;
+extern StructRNA RNA_AnimVizMotionPaths;
extern StructRNA RNA_AnimVizOnionSkinning;
-extern StructRNA RNA_AnimVizMotionPaths;
extern StructRNA RNA_AnyType;
extern StructRNA RNA_Area;
extern StructRNA RNA_AreaLamp;
@@ -253,9 +253,9 @@
extern StructRNA RNA_Key;
extern StructRNA RNA_KeyboardSensor;
extern StructRNA RNA_KeyConfig;
+extern StructRNA RNA_Keyframe;
extern StructRNA RNA_KeyingSet;
extern StructRNA RNA_KeyingSetPath;
-extern StructRNA RNA_Keyframe;
extern StructRNA RNA_KeyMap;
extern StructRNA RNA_KeyMapItem;
extern StructRNA RNA_KinematicConstraint;
@@ -271,6 +271,7 @@
extern StructRNA RNA_LimitRotationConstraint;
extern StructRNA RNA_LimitScaleConstraint;
extern StructRNA RNA_LockedTrackConstraint;
+extern StructRNA RNA_Macro;
extern StructRNA RNA_MagicTexture;
extern StructRNA RNA_Main;
extern StructRNA RNA_MarbleTexture;
@@ -308,10 +309,10 @@
extern StructRNA RNA_MetaSequence;
extern StructRNA RNA_MirrorModifier;
extern StructRNA RNA_Modifier;
+extern StructRNA RNA_MotionPath;
+extern StructRNA RNA_MotionPathVert;
extern StructRNA RNA_MouseSensor;
extern StructRNA RNA_MovieSequence;
-extern StructRNA RNA_MotionPath;
-extern StructRNA RNA_MotionPathVert;
extern StructRNA RNA_MultiresModifier;
extern StructRNA RNA_MusgraveTexture;
extern StructRNA RNA_NandController;
@@ -324,12 +325,10 @@
extern StructRNA RNA_NodeTree;
extern StructRNA RNA_NoiseTexture;
extern StructRNA RNA_NorController;
-extern StructRNA RNA_Nurb;
extern StructRNA RNA_Object;
extern StructRNA RNA_ObjectBase;
extern StructRNA RNA_ObstacleFluidSettings;
extern StructRNA RNA_Operator;
-extern StructRNA RNA_Macro;
extern StructRNA RNA_OperatorFileListElement;
extern StructRNA RNA_OperatorMousePath;
extern StructRNA RNA_OperatorProperties;
@@ -449,6 +448,7 @@
extern StructRNA RNA_SpaceUserPreferences;
extern StructRNA RNA_SpaceUVEditor;
extern StructRNA RNA_SpeedControlSequence;
+extern StructRNA RNA_Spline;
extern StructRNA RNA_SplineIKConstraint;
extern StructRNA RNA_SpotLamp;
extern StructRNA RNA_StretchToConstraint;
@@ -555,6 +555,7 @@
extern StructRNA RNA_XnorController;
extern StructRNA RNA_XorController;
+
/* Pointer
*
* These functions will fill in RNA pointers, this can be done in three ways:
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2010-02-10 03:41:20 UTC (rev 26759)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2010-02-10 08:53:08 UTC (rev 26760)
@@ -82,7 +82,7 @@
nu = BLI_findlink(cu->editnurb, cu->actnu);
if(nu)
- return rna_pointer_inherit_refine(ptr, &RNA_Nurb, nu);
+ return rna_pointer_inherit_refine(ptr, &RNA_Spline, nu);
return rna_pointer_inherit_refine(ptr, NULL, NULL);
}
@@ -755,11 +755,11 @@
prop= RNA_def_property(srna, "splines", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "nurb", NULL);
- RNA_def_property_struct_type(prop, "Nurb");
+ RNA_def_property_struct_type(prop, "Spline");
RNA_def_property_ui_text(prop, "Splines", "Collection of splines in this curve data object.");
prop= RNA_def_property(srna, "active_spline", PROP_POINTER, PROP_NONE);
- RNA_def_property_struct_type(prop, "Nurb");
+ RNA_def_property_struct_type(prop, "Spline");
RNA_def_property_pointer_funcs(prop, "rna_Curve_active_nurb_get", NULL, NULL);
RNA_def_property_ui_text(prop, "Active Spline", "The active editmode spline");
@@ -902,7 +902,8 @@
StructRNA *srna;
PropertyRNA *prop;
- srna= RNA_def_struct(brna, "Nurb", NULL);
+ srna= RNA_def_struct(brna, "Spline", NULL);
+ RNA_def_struct_sdna(srna, "Nurb");
RNA_def_struct_ui_text(srna, "Spline", "Element of a curve, either Nurbs, Bezier or Polyline or a character with text objects.");
prop= RNA_def_property(srna, "points", PROP_COLLECTION, PROP_NONE);
More information about the Bf-blender-cvs
mailing list