diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-02-10 11:53:08 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-10 11:53:08 +0300 |
commit | eabb8e2942750dc0563b36a3dbe878eb784a879c (patch) | |
tree | b3def12f43d5ab84f6c04b5f43a6420aa0c4d878 /source/blender | |
parent | f07efaf124786492e30b5c3bcffecdd6106cc3c1 (diff) |
rename Nurb to Spline in RNA since Nurb also stores bezier and poly lines.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 13 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 70796bd5806..466f5ab306f 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -180,7 +180,7 @@ int ED_vgroup_copy_array(Object *ob, Object *ob_from) /* 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); diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 5feadb92d17..0718c041a13 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -53,8 +53,8 @@ extern StructRNA RNA_AlwaysSensor; extern StructRNA RNA_AndController; extern StructRNA RNA_AnimData; extern StructRNA RNA_AnimViz; -extern StructRNA RNA_AnimVizOnionSkinning; extern StructRNA RNA_AnimVizMotionPaths; +extern StructRNA RNA_AnimVizOnionSkinning; extern StructRNA RNA_AnyType; extern StructRNA RNA_Area; extern StructRNA RNA_AreaLamp; @@ -253,9 +253,9 @@ extern StructRNA RNA_JoystickSensor; 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_LimitLocationConstraint; 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_MetaElement; extern StructRNA RNA_MetaSequence; extern StructRNA RNA_MirrorModifier; extern StructRNA RNA_Modifier; -extern StructRNA RNA_MouseSensor; -extern StructRNA RNA_MovieSequence; extern StructRNA RNA_MotionPath; extern StructRNA RNA_MotionPathVert; +extern StructRNA RNA_MouseSensor; +extern StructRNA RNA_MovieSequence; extern StructRNA RNA_MultiresModifier; extern StructRNA RNA_MusgraveTexture; extern StructRNA RNA_NandController; @@ -324,12 +325,10 @@ extern StructRNA RNA_NodeSocket; 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_SpaceTimeline; 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_WorldTextureSlot; extern StructRNA RNA_XnorController; extern StructRNA RNA_XorController; + /* Pointer * * These functions will fill in RNA pointers, this can be done in three ways: diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 03293601ca0..6159881a1f6 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -82,7 +82,7 @@ static PointerRNA rna_Curve_active_nurb_get(PointerRNA *ptr) 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 @@ static void rna_def_curve(BlenderRNA *brna) 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 @@ static void rna_def_curve_nurb(BlenderRNA *brna) 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); |