forked from bartvdbraak/blender
- access to a nurbs points was broken - sizeof(BPoint) vs sizeof(BPoint *)
- renamed CurvePoint --> SplinePoint - renamed point.point --> point.co (less stupid, matches vertex.co) - access point.co was a 3D vector rather then a 4D vector with the Nurbs weight included. - rename point.weight --> point.weight_softbody, move point.point[3] --> point.weight - sorted RNA structs (for pedaticness only)
This commit is contained in:
parent
e08b6b8376
commit
3b72584b7d
@ -60,9 +60,9 @@ extern StructRNA RNA_ArmatureSensor;
|
||||
extern StructRNA RNA_ArrayModifier;
|
||||
extern StructRNA RNA_BackgroundImage;
|
||||
extern StructRNA RNA_BevelModifier;
|
||||
extern StructRNA RNA_BezierCurvePoint;
|
||||
extern StructRNA RNA_BlendTexture;
|
||||
extern StructRNA RNA_BezierSplinePoint;
|
||||
extern StructRNA RNA_BlenderRNA;
|
||||
extern StructRNA RNA_BlendTexture;
|
||||
extern StructRNA RNA_BoidRule;
|
||||
extern StructRNA RNA_BoidRuleAverageSpeed;
|
||||
extern StructRNA RNA_BoidRuleAvoid;
|
||||
@ -168,8 +168,8 @@ extern StructRNA RNA_CopyRotationConstraint;
|
||||
extern StructRNA RNA_CopyScaleConstraint;
|
||||
extern StructRNA RNA_Curve;
|
||||
extern StructRNA RNA_CurveMap;
|
||||
extern StructRNA RNA_CurveMapPoint;
|
||||
extern StructRNA RNA_CurveMapping;
|
||||
extern StructRNA RNA_CurveMapPoint;
|
||||
extern StructRNA RNA_CurveModifier;
|
||||
extern StructRNA RNA_CurvePoint;
|
||||
extern StructRNA RNA_DampedTrackConstraint;
|
||||
@ -183,8 +183,8 @@ extern StructRNA RNA_DriverTarget;
|
||||
extern StructRNA RNA_DupliObject;
|
||||
extern StructRNA RNA_EdgeSplitModifier;
|
||||
extern StructRNA RNA_EditBone;
|
||||
extern StructRNA RNA_EffectSequence;
|
||||
extern StructRNA RNA_EffectorWeights;
|
||||
extern StructRNA RNA_EffectSequence;
|
||||
extern StructRNA RNA_EnumProperty;
|
||||
extern StructRNA RNA_EnumPropertyItem;
|
||||
extern StructRNA RNA_EnvironmentMap;
|
||||
@ -194,6 +194,13 @@ extern StructRNA RNA_ExplodeModifier;
|
||||
extern StructRNA RNA_ExpressionController;
|
||||
extern StructRNA RNA_FCurve;
|
||||
extern StructRNA RNA_FCurveSample;
|
||||
extern StructRNA RNA_FieldSettings;
|
||||
extern StructRNA RNA_FileSelectParams;
|
||||
extern StructRNA RNA_FloatProperty;
|
||||
extern StructRNA RNA_FloorConstraint;
|
||||
extern StructRNA RNA_FluidFluidSettings;
|
||||
extern StructRNA RNA_FluidSettings;
|
||||
extern StructRNA RNA_FluidSimulationModifier;
|
||||
extern StructRNA RNA_FModifier;
|
||||
extern StructRNA RNA_FModifierCycles;
|
||||
extern StructRNA RNA_FModifierEnvelope;
|
||||
@ -204,19 +211,8 @@ extern StructRNA RNA_FModifierLimits;
|
||||
extern StructRNA RNA_FModifierNoise;
|
||||
extern StructRNA RNA_FModifierPython;
|
||||
extern StructRNA RNA_FModifierSound;
|
||||
extern StructRNA RNA_FieldSettings;
|
||||
extern StructRNA RNA_FileSelectParams;
|
||||
extern StructRNA RNA_FloatProperty;
|
||||
extern StructRNA RNA_FloorConstraint;
|
||||
extern StructRNA RNA_FluidFluidSettings;
|
||||
extern StructRNA RNA_FluidSettings;
|
||||
extern StructRNA RNA_FluidSimulationModifier;
|
||||
extern StructRNA RNA_FollowPathConstraint;
|
||||
extern StructRNA RNA_Function;
|
||||
extern StructRNA RNA_GPencilFrame;
|
||||
extern StructRNA RNA_GPencilLayer;
|
||||
extern StructRNA RNA_GPencilStroke;
|
||||
extern StructRNA RNA_GPencilStrokePoint;
|
||||
extern StructRNA RNA_GameBooleanProperty;
|
||||
extern StructRNA RNA_GameFloatProperty;
|
||||
extern StructRNA RNA_GameIntProperty;
|
||||
@ -226,6 +222,10 @@ extern StructRNA RNA_GameSoftBodySettings;
|
||||
extern StructRNA RNA_GameStringProperty;
|
||||
extern StructRNA RNA_GameTimerProperty;
|
||||
extern StructRNA RNA_GlowSequence;
|
||||
extern StructRNA RNA_GPencilFrame;
|
||||
extern StructRNA RNA_GPencilLayer;
|
||||
extern StructRNA RNA_GPencilStroke;
|
||||
extern StructRNA RNA_GPencilStrokePoint;
|
||||
extern StructRNA RNA_GreasePencil;
|
||||
extern StructRNA RNA_Group;
|
||||
extern StructRNA RNA_Header;
|
||||
@ -245,12 +245,12 @@ extern StructRNA RNA_IntProperty;
|
||||
extern StructRNA RNA_Itasc;
|
||||
extern StructRNA RNA_JoystickSensor;
|
||||
extern StructRNA RNA_Key;
|
||||
extern StructRNA RNA_KeyConfig;
|
||||
extern StructRNA RNA_KeyMap;
|
||||
extern StructRNA RNA_KeyMapItem;
|
||||
extern StructRNA RNA_KeyboardSensor;
|
||||
extern StructRNA RNA_KeyConfig;
|
||||
extern StructRNA RNA_KeyingSet;
|
||||
extern StructRNA RNA_KeyingSetPath;
|
||||
extern StructRNA RNA_KeyMap;
|
||||
extern StructRNA RNA_KeyMapItem;
|
||||
extern StructRNA RNA_KinematicConstraint;
|
||||
extern StructRNA RNA_Lamp;
|
||||
extern StructRNA RNA_LampSkySettings;
|
||||
@ -310,8 +310,8 @@ extern StructRNA RNA_NearSensor;
|
||||
extern StructRNA RNA_NlaStrip;
|
||||
extern StructRNA RNA_NlaTrack;
|
||||
extern StructRNA RNA_Node;
|
||||
extern StructRNA RNA_NodeTree;
|
||||
extern StructRNA RNA_NodeSocket;
|
||||
extern StructRNA RNA_NodeTree;
|
||||
extern StructRNA RNA_NoiseTexture;
|
||||
extern StructRNA RNA_NorController;
|
||||
extern StructRNA RNA_Nurb;
|
||||
@ -345,8 +345,8 @@ extern StructRNA RNA_PluginTexture;
|
||||
extern StructRNA RNA_PointCache;
|
||||
extern StructRNA RNA_PointDensity;
|
||||
extern StructRNA RNA_PointDensityTexture;
|
||||
extern StructRNA RNA_PointLamp;
|
||||
extern StructRNA RNA_PointerProperty;
|
||||
extern StructRNA RNA_PointLamp;
|
||||
extern StructRNA RNA_Pose;
|
||||
extern StructRNA RNA_PoseBone;
|
||||
extern StructRNA RNA_Property;
|
||||
@ -417,7 +417,6 @@ extern StructRNA RNA_SoftBodyModifier;
|
||||
extern StructRNA RNA_SoftBodySettings;
|
||||
extern StructRNA RNA_Sound;
|
||||
extern StructRNA RNA_SoundSequence;
|
||||
extern StructRNA RNA_SplineIKConstraint;
|
||||
extern StructRNA RNA_Space;
|
||||
extern StructRNA RNA_Space3DView;
|
||||
extern StructRNA RNA_SpaceConsole;
|
||||
@ -434,9 +433,10 @@ extern StructRNA RNA_SpaceProperties;
|
||||
extern StructRNA RNA_SpaceSequenceEditor;
|
||||
extern StructRNA RNA_SpaceTextEditor;
|
||||
extern StructRNA RNA_SpaceTimeline;
|
||||
extern StructRNA RNA_SpaceUVEditor;
|
||||
extern StructRNA RNA_SpaceUserPreferences;
|
||||
extern StructRNA RNA_SpaceUVEditor;
|
||||
extern StructRNA RNA_SpeedControlSequence;
|
||||
extern StructRNA RNA_SplineIKConstraint;
|
||||
extern StructRNA RNA_SpotLamp;
|
||||
extern StructRNA RNA_StretchToConstraint;
|
||||
extern StructRNA RNA_StringProperty;
|
||||
@ -509,8 +509,6 @@ extern StructRNA RNA_TransformConstraint;
|
||||
extern StructRNA RNA_TransformSequence;
|
||||
extern StructRNA RNA_UILayout;
|
||||
extern StructRNA RNA_UIListItem;
|
||||
extern StructRNA RNA_UVProjectModifier;
|
||||
extern StructRNA RNA_UVProjector;
|
||||
extern StructRNA RNA_UnitSettings;
|
||||
extern StructRNA RNA_UnknownType;
|
||||
extern StructRNA RNA_UserPreferences;
|
||||
@ -519,6 +517,8 @@ extern StructRNA RNA_UserPreferencesFilePaths;
|
||||
extern StructRNA RNA_UserPreferencesSystem;
|
||||
extern StructRNA RNA_UserPreferencesView;
|
||||
extern StructRNA RNA_UserSolidLight;
|
||||
extern StructRNA RNA_UVProjectModifier;
|
||||
extern StructRNA RNA_UVProjector;
|
||||
extern StructRNA RNA_ValueNodeSocket;
|
||||
extern StructRNA RNA_VectorFont;
|
||||
extern StructRNA RNA_VectorNodeSocket;
|
||||
|
@ -212,7 +212,7 @@ static void rna_Nurb_type_set(PointerRNA *ptr, int value)
|
||||
static void rna_BPoint_array_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
|
||||
{
|
||||
Nurb *nu= (Nurb*)ptr->data;
|
||||
rna_iterator_array_begin(iter, (void*)nu->bp, sizeof(BPoint*), nu->pntsv>0 ? nu->pntsu*nu->pntsv : nu->pntsu, 0, NULL);
|
||||
rna_iterator_array_begin(iter, (void*)nu->bp, sizeof(BPoint), nu->pntsv>0 ? nu->pntsu*nu->pntsv : nu->pntsu, 0, NULL);
|
||||
}
|
||||
|
||||
static void rna_Curve_update_data(bContext *C, PointerRNA *ptr)
|
||||
@ -298,9 +298,9 @@ static void rna_def_bpoint(BlenderRNA *brna)
|
||||
StructRNA *srna;
|
||||
PropertyRNA *prop;
|
||||
|
||||
srna= RNA_def_struct(brna, "CurvePoint", NULL);
|
||||
srna= RNA_def_struct(brna, "SplinePoint", NULL);
|
||||
RNA_def_struct_sdna(srna, "BPoint");
|
||||
RNA_def_struct_ui_text(srna, "CurvePoint", "Curve point without handles.");
|
||||
RNA_def_struct_ui_text(srna, "SplinePoint", "Spline point without handles.");
|
||||
|
||||
/* Boolean values */
|
||||
prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
|
||||
@ -314,12 +314,17 @@ static void rna_def_bpoint(BlenderRNA *brna)
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
/* Vector value */
|
||||
prop= RNA_def_property(srna, "point", PROP_FLOAT, PROP_TRANSLATION);
|
||||
RNA_def_property_array(prop, 4);
|
||||
prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
|
||||
RNA_def_property_array(prop, 3);
|
||||
RNA_def_property_float_sdna(prop, NULL, "vec");
|
||||
RNA_def_property_ui_text(prop, "Point", "Point coordinates");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "weight", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "vec[3]");
|
||||
RNA_def_property_ui_text(prop, "Weight", "Nurbs weight");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
/* Number values */
|
||||
prop= RNA_def_property(srna, "tilt", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "alfa");
|
||||
@ -327,7 +332,8 @@ static void rna_def_bpoint(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Tilt", "Tilt in 3d View");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "weight", PROP_FLOAT, PROP_NONE);
|
||||
prop= RNA_def_property(srna, "weight_softbody", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "weight");
|
||||
RNA_def_property_range(prop, 0.01f, 100.0f);
|
||||
RNA_def_property_ui_text(prop, "Weight", "Softbody goal weight");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
@ -345,7 +351,7 @@ static void rna_def_beztriple(BlenderRNA *brna)
|
||||
StructRNA *srna;
|
||||
PropertyRNA *prop;
|
||||
|
||||
srna= RNA_def_struct(brna, "BezierCurvePoint", NULL);
|
||||
srna= RNA_def_struct(brna, "BezierSplinePoint", NULL);
|
||||
RNA_def_struct_sdna(srna, "BezTriple");
|
||||
RNA_def_struct_ui_text(srna, "Bezier Curve Point", "Bezier curve point with two handles.");
|
||||
|
||||
@ -402,7 +408,7 @@ static void rna_def_beztriple(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Handle 1", "Coordinates of the first handle");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
prop= RNA_def_property(srna, "control_point", PROP_FLOAT, PROP_TRANSLATION);
|
||||
prop= RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
|
||||
RNA_def_property_array(prop, 3);
|
||||
RNA_def_property_float_funcs(prop, "rna_BezTriple_ctrlpoint_get", "rna_BezTriple_ctrlpoint_set", NULL);
|
||||
RNA_def_property_ui_text(prop, "Control Point", "Coordinates of the control point");
|
||||
@ -888,12 +894,12 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
|
||||
|
||||
prop= RNA_def_property(srna, "points", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_collection_sdna(prop, NULL, "bp", NULL);
|
||||
RNA_def_property_struct_type(prop, "CurvePoint");
|
||||
RNA_def_property_struct_type(prop, "SplinePoint");
|
||||
RNA_def_property_collection_funcs(prop, "rna_BPoint_array_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_Nurb_length", 0, 0);
|
||||
RNA_def_property_ui_text(prop, "Points", "Collection of points that make up this poly or nurbs spline.");
|
||||
|
||||
prop= RNA_def_property(srna, "bezier_points", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "BezierCurvePoint");
|
||||
RNA_def_property_struct_type(prop, "BezierSplinePoint");
|
||||
RNA_def_property_collection_sdna(prop, NULL, "bezt", "pntsu");
|
||||
RNA_def_property_ui_text(prop, "Bezier Points", "Collection of points for bezier curves only.");
|
||||
|
||||
|
@ -941,7 +941,7 @@ static void rna_def_fcurve(BlenderRNA *brna)
|
||||
|
||||
prop= RNA_def_property(srna, "keyframe_points", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_collection_sdna(prop, NULL, "bezt", "totvert");
|
||||
RNA_def_property_struct_type(prop, "BezierCurvePoint");
|
||||
RNA_def_property_struct_type(prop, "BezierSplinePoint");
|
||||
RNA_def_property_ui_text(prop, "Keyframes", "User-editable keyframes");
|
||||
|
||||
prop= RNA_def_property(srna, "modifiers", PROP_COLLECTION, PROP_NONE);
|
||||
|
@ -260,16 +260,6 @@ static void PYTHON_OT_draw(bContext *C, wmOperator *op, uiLayout *layout)
|
||||
PYTHON_OT_generic(PYOP_DRAW, C, op->type, op, NULL, layout);
|
||||
}
|
||||
|
||||
// void (*ui)(struct bContext *, struct PointerRNA *, struct uiLayout *);
|
||||
//
|
||||
//static int PYTHON_OT_ui(bContext *C, PointerRNA *, uiLayout *layout)
|
||||
//{
|
||||
// PointerRNA ptr_context, ptr_layout;
|
||||
// RNA_pointer_create(NULL, &RNA_Context, C, &ptr_context);
|
||||
// RNA_pointer_create(NULL, &RNA_UILayout, layout, &ptr_layout);
|
||||
//
|
||||
//}
|
||||
|
||||
void PYTHON_OT_wrapper(wmOperatorType *ot, void *userdata)
|
||||
{
|
||||
PyObject *py_class = (PyObject *)userdata;
|
||||
@ -453,6 +443,3 @@ PyObject *PYOP_wrap_remove(PyObject *self, PyObject *value)
|
||||
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user