forked from bartvdbraak/blender
rename IDPropertyGroup to PropertyGroup
also renamed IDProperty to PropertyGroupItem (these are not referenced for common usage and we already have 'Property' defined).
This commit is contained in:
parent
fee5363912
commit
4c35d8d5a8
@ -365,13 +365,13 @@ class RENDER_PT_network_output(NeedValidAddress, NetRenderButtonsPanel, bpy.type
|
||||
|
||||
|
||||
def addProperties():
|
||||
class NetRenderSettings(bpy.types.IDPropertyGroup):
|
||||
class NetRenderSettings(bpy.types.PropertyGroup):
|
||||
pass
|
||||
|
||||
class NetRenderSlave(bpy.types.IDPropertyGroup):
|
||||
class NetRenderSlave(bpy.types.PropertyGroup):
|
||||
pass
|
||||
|
||||
class NetRenderJob(bpy.types.IDPropertyGroup):
|
||||
class NetRenderJob(bpy.types.PropertyGroup):
|
||||
pass
|
||||
|
||||
bpy.utils.register_class(NetRenderSettings)
|
||||
|
@ -23,7 +23,7 @@ import _bpy
|
||||
from mathutils import Vector
|
||||
|
||||
StructRNA = bpy_types.Struct.__bases__[0]
|
||||
StructMetaIDProp = _bpy.StructMetaIDProp
|
||||
StructMetaPropGroup = _bpy.StructMetaPropGroup
|
||||
# StructRNA = bpy_types.Struct
|
||||
|
||||
|
||||
@ -258,15 +258,15 @@ class _GenericBone:
|
||||
return bones
|
||||
|
||||
|
||||
class PoseBone(StructRNA, _GenericBone, metaclass=StructMetaIDProp):
|
||||
class PoseBone(StructRNA, _GenericBone, metaclass=StructMetaPropGroup):
|
||||
__slots__ = ()
|
||||
|
||||
|
||||
class Bone(StructRNA, _GenericBone, metaclass=StructMetaIDProp):
|
||||
class Bone(StructRNA, _GenericBone, metaclass=StructMetaPropGroup):
|
||||
__slots__ = ()
|
||||
|
||||
|
||||
class EditBone(StructRNA, _GenericBone, metaclass=StructMetaIDProp):
|
||||
class EditBone(StructRNA, _GenericBone, metaclass=StructMetaPropGroup):
|
||||
__slots__ = ()
|
||||
|
||||
def align_orientation(self, other):
|
||||
@ -579,7 +579,7 @@ class RNAMeta(type):
|
||||
import collections
|
||||
|
||||
|
||||
class RNAMetaIDProp(RNAMeta, StructMetaIDProp):
|
||||
class RNAMetaPropGroup(RNAMeta, StructMetaPropGroup):
|
||||
pass
|
||||
|
||||
|
||||
@ -637,7 +637,7 @@ class Macro(StructRNA, metaclass=OrderedMeta):
|
||||
return ops.macro_define(self, opname)
|
||||
|
||||
|
||||
class IDPropertyGroup(StructRNA, metaclass=RNAMetaIDProp):
|
||||
class PropertyGroup(StructRNA, metaclass=RNAMetaPropGroup):
|
||||
__slots__ = ()
|
||||
|
||||
|
||||
|
@ -43,7 +43,6 @@ struct Scene;
|
||||
/* Types */
|
||||
|
||||
extern BlenderRNA BLENDER_RNA;
|
||||
|
||||
extern StructRNA RNA_Action;
|
||||
extern StructRNA RNA_ActionConstraint;
|
||||
extern StructRNA RNA_ActionGroup;
|
||||
@ -66,8 +65,9 @@ extern StructRNA RNA_ArrayModifier;
|
||||
extern StructRNA RNA_BackgroundImage;
|
||||
extern StructRNA RNA_BevelModifier;
|
||||
extern StructRNA RNA_BezierSplinePoint;
|
||||
extern StructRNA RNA_BlenderRNA;
|
||||
extern StructRNA RNA_BlendData;
|
||||
extern StructRNA RNA_BlendTexture;
|
||||
extern StructRNA RNA_BlenderRNA;
|
||||
extern StructRNA RNA_BoidRule;
|
||||
extern StructRNA RNA_BoidRuleAverageSpeed;
|
||||
extern StructRNA RNA_BoidRuleAvoid;
|
||||
@ -175,8 +175,8 @@ extern StructRNA RNA_CopyScaleConstraint;
|
||||
extern StructRNA RNA_CopyTransformsConstraint;
|
||||
extern StructRNA RNA_Curve;
|
||||
extern StructRNA RNA_CurveMap;
|
||||
extern StructRNA RNA_CurveMapping;
|
||||
extern StructRNA RNA_CurveMapPoint;
|
||||
extern StructRNA RNA_CurveMapping;
|
||||
extern StructRNA RNA_CurveModifier;
|
||||
extern StructRNA RNA_CurvePoint;
|
||||
extern StructRNA RNA_DampedTrackConstraint;
|
||||
@ -191,8 +191,8 @@ extern StructRNA RNA_DriverVariable;
|
||||
extern StructRNA RNA_DupliObject;
|
||||
extern StructRNA RNA_EdgeSplitModifier;
|
||||
extern StructRNA RNA_EditBone;
|
||||
extern StructRNA RNA_EffectorWeights;
|
||||
extern StructRNA RNA_EffectSequence;
|
||||
extern StructRNA RNA_EffectorWeights;
|
||||
extern StructRNA RNA_EnumProperty;
|
||||
extern StructRNA RNA_EnumPropertyItem;
|
||||
extern StructRNA RNA_EnvironmentMap;
|
||||
@ -202,13 +202,6 @@ 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;
|
||||
@ -219,8 +212,19 @@ extern StructRNA RNA_FModifierLimits;
|
||||
extern StructRNA RNA_FModifierNoise;
|
||||
extern StructRNA RNA_FModifierPython;
|
||||
extern StructRNA RNA_FModifierStepped;
|
||||
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;
|
||||
@ -230,10 +234,6 @@ 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;
|
||||
@ -241,8 +241,6 @@ extern StructRNA RNA_HemiLamp;
|
||||
extern StructRNA RNA_Histogram;
|
||||
extern StructRNA RNA_HookModifier;
|
||||
extern StructRNA RNA_ID;
|
||||
extern StructRNA RNA_IDProperty;
|
||||
extern StructRNA RNA_IDPropertyGroup;
|
||||
extern StructRNA RNA_IKParam;
|
||||
extern StructRNA RNA_Image;
|
||||
extern StructRNA RNA_ImagePaint;
|
||||
@ -254,14 +252,14 @@ extern StructRNA RNA_IntProperty;
|
||||
extern StructRNA RNA_Itasc;
|
||||
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_KeyingSetInfo;
|
||||
extern StructRNA RNA_KeyMap;
|
||||
extern StructRNA RNA_KeyMapItem;
|
||||
extern StructRNA RNA_KeyboardSensor;
|
||||
extern StructRNA RNA_Keyframe;
|
||||
extern StructRNA RNA_KeyingSet;
|
||||
extern StructRNA RNA_KeyingSetInfo;
|
||||
extern StructRNA RNA_KeyingSetPath;
|
||||
extern StructRNA RNA_KinematicConstraint;
|
||||
extern StructRNA RNA_Lamp;
|
||||
extern StructRNA RNA_LampSkySettings;
|
||||
@ -277,7 +275,6 @@ extern StructRNA RNA_LimitScaleConstraint;
|
||||
extern StructRNA RNA_LockedTrackConstraint;
|
||||
extern StructRNA RNA_Macro;
|
||||
extern StructRNA RNA_MagicTexture;
|
||||
extern StructRNA RNA_BlendData;
|
||||
extern StructRNA RNA_MarbleTexture;
|
||||
extern StructRNA RNA_MaskModifier;
|
||||
extern StructRNA RNA_Material;
|
||||
@ -355,7 +352,6 @@ extern StructRNA RNA_ParticleInstanceModifier;
|
||||
extern StructRNA RNA_ParticleKey;
|
||||
extern StructRNA RNA_ParticleSettings;
|
||||
extern StructRNA RNA_ParticleSettingsTextureSlot;
|
||||
extern StructRNA RNA_SPHFluidSettings;
|
||||
extern StructRNA RNA_ParticleSystem;
|
||||
extern StructRNA RNA_ParticleSystemModifier;
|
||||
extern StructRNA RNA_ParticleTarget;
|
||||
@ -365,14 +361,17 @@ extern StructRNA RNA_PluginTexture;
|
||||
extern StructRNA RNA_PointCache;
|
||||
extern StructRNA RNA_PointDensity;
|
||||
extern StructRNA RNA_PointDensityTexture;
|
||||
extern StructRNA RNA_PointerProperty;
|
||||
extern StructRNA RNA_PointLamp;
|
||||
extern StructRNA RNA_PointerProperty;
|
||||
extern StructRNA RNA_Pose;
|
||||
extern StructRNA RNA_PoseBone;
|
||||
extern StructRNA RNA_Property;
|
||||
extern StructRNA RNA_PropertyGroup;
|
||||
extern StructRNA RNA_PropertyGroupItem;
|
||||
extern StructRNA RNA_PropertySensor;
|
||||
extern StructRNA RNA_PythonConstraint;
|
||||
extern StructRNA RNA_PythonController;
|
||||
extern StructRNA RNA_RGBANodeSocket;
|
||||
extern StructRNA RNA_RadarSensor;
|
||||
extern StructRNA RNA_RandomSensor;
|
||||
extern StructRNA RNA_RaySensor;
|
||||
@ -382,8 +381,8 @@ extern StructRNA RNA_RenderLayer;
|
||||
extern StructRNA RNA_RenderPass;
|
||||
extern StructRNA RNA_RenderResult;
|
||||
extern StructRNA RNA_RenderSettings;
|
||||
extern StructRNA RNA_RGBANodeSocket;
|
||||
extern StructRNA RNA_RigidBodyJointConstraint;
|
||||
extern StructRNA RNA_SPHFluidSettings;
|
||||
extern StructRNA RNA_Scene;
|
||||
extern StructRNA RNA_SceneGameData;
|
||||
extern StructRNA RNA_SceneRenderLayer;
|
||||
@ -442,7 +441,6 @@ extern StructRNA RNA_SolidifyModifier;
|
||||
extern StructRNA RNA_Sound;
|
||||
extern StructRNA RNA_SoundSequence;
|
||||
extern StructRNA RNA_Space;
|
||||
extern StructRNA RNA_SpaceView3D;
|
||||
extern StructRNA RNA_SpaceConsole;
|
||||
extern StructRNA RNA_SpaceDopeSheetEditor;
|
||||
extern StructRNA RNA_SpaceFileBrowser;
|
||||
@ -457,8 +455,9 @@ extern StructRNA RNA_SpaceProperties;
|
||||
extern StructRNA RNA_SpaceSequenceEditor;
|
||||
extern StructRNA RNA_SpaceTextEditor;
|
||||
extern StructRNA RNA_SpaceTimeline;
|
||||
extern StructRNA RNA_SpaceUserPreferences;
|
||||
extern StructRNA RNA_SpaceUVEditor;
|
||||
extern StructRNA RNA_SpaceUserPreferences;
|
||||
extern StructRNA RNA_SpaceView3D;
|
||||
extern StructRNA RNA_SpeedControlSequence;
|
||||
extern StructRNA RNA_Spline;
|
||||
extern StructRNA RNA_SplineIKConstraint;
|
||||
@ -536,6 +535,8 @@ 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;
|
||||
@ -544,8 +545,6 @@ 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;
|
||||
|
@ -200,22 +200,22 @@ void rna_ID_fake_user_set(PointerRNA *ptr, int value)
|
||||
}
|
||||
}
|
||||
|
||||
IDProperty *rna_IDPropertyGroup_idprops(PointerRNA *ptr, int create)
|
||||
IDProperty *rna_PropertyGroup_idprops(PointerRNA *ptr, int create)
|
||||
{
|
||||
return ptr->data;
|
||||
}
|
||||
|
||||
void rna_IDPropertyGroup_unregister(const bContext *C, StructRNA *type)
|
||||
void rna_PropertyGroup_unregister(const bContext *C, StructRNA *type)
|
||||
{
|
||||
RNA_struct_free(&BLENDER_RNA, type);
|
||||
}
|
||||
|
||||
StructRNA *rna_IDPropertyGroup_register(bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
|
||||
StructRNA *rna_PropertyGroup_register(bContext *C, ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free)
|
||||
{
|
||||
PointerRNA dummyptr;
|
||||
|
||||
/* create dummy pointer */
|
||||
RNA_pointer_create(NULL, &RNA_IDPropertyGroup, NULL, &dummyptr);
|
||||
RNA_pointer_create(NULL, &RNA_PropertyGroup, NULL, &dummyptr);
|
||||
|
||||
/* validate the python class */
|
||||
if(validate(&dummyptr, data, NULL) != 0)
|
||||
@ -230,10 +230,10 @@ StructRNA *rna_IDPropertyGroup_register(bContext *C, ReportList *reports, void *
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return RNA_def_struct(&BLENDER_RNA, identifier, "IDPropertyGroup"); // XXX
|
||||
return RNA_def_struct(&BLENDER_RNA, identifier, "PropertyGroup"); // XXX
|
||||
}
|
||||
|
||||
StructRNA* rna_IDPropertyGroup_refine(PointerRNA *ptr)
|
||||
StructRNA* rna_PropertyGroup_refine(PointerRNA *ptr)
|
||||
{
|
||||
return ptr->type;
|
||||
}
|
||||
@ -314,7 +314,8 @@ static void rna_def_ID_properties(BlenderRNA *brna)
|
||||
|
||||
/* this is struct is used for holding the virtual
|
||||
* PropertyRNA's for ID properties */
|
||||
srna= RNA_def_struct(brna, "IDProperty", NULL);
|
||||
srna= RNA_def_struct(brna, "PropertyGroupItem", NULL);
|
||||
RNA_def_struct_sdna(srna, "IDProperty");
|
||||
RNA_def_struct_ui_text(srna, "ID Property", "Property that stores arbitrary, user defined properties");
|
||||
|
||||
/* IDP_STRING */
|
||||
@ -349,14 +350,14 @@ static void rna_def_ID_properties(BlenderRNA *brna)
|
||||
prop= RNA_def_property(srna, "group", PROP_POINTER, PROP_NONE);
|
||||
RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY);
|
||||
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
|
||||
RNA_def_property_struct_type(prop, "IDPropertyGroup");
|
||||
RNA_def_property_struct_type(prop, "PropertyGroup");
|
||||
|
||||
prop= RNA_def_property(srna, "collection", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY);
|
||||
RNA_def_property_struct_type(prop, "IDPropertyGroup");
|
||||
RNA_def_property_struct_type(prop, "PropertyGroup");
|
||||
|
||||
prop= RNA_def_property(srna, "idp_array", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_struct_type(prop, "IDPropertyGroup");
|
||||
RNA_def_property_struct_type(prop, "PropertyGroup");
|
||||
RNA_def_property_collection_funcs(prop, "rna_IDPArray_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_IDPArray_length", 0, 0);
|
||||
RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY);
|
||||
|
||||
@ -374,11 +375,12 @@ static void rna_def_ID_properties(BlenderRNA *brna)
|
||||
/* ID property groups > level 0, since level 0 group is merged
|
||||
* with native RNA properties. the builtin_properties will take
|
||||
* care of the properties here */
|
||||
srna= RNA_def_struct(brna, "IDPropertyGroup", NULL);
|
||||
srna= RNA_def_struct(brna, "PropertyGroup", NULL);
|
||||
RNA_def_struct_sdna(srna, "IDPropertyGroup");
|
||||
RNA_def_struct_ui_text(srna, "ID Property Group", "Group of ID properties");
|
||||
RNA_def_struct_idprops_func(srna, "rna_IDPropertyGroup_idprops");
|
||||
RNA_def_struct_register_funcs(srna, "rna_IDPropertyGroup_register", "rna_IDPropertyGroup_unregister");
|
||||
RNA_def_struct_refine_func(srna, "rna_IDPropertyGroup_refine");
|
||||
RNA_def_struct_idprops_func(srna, "rna_PropertyGroup_idprops");
|
||||
RNA_def_struct_register_funcs(srna, "rna_PropertyGroup_register", "rna_PropertyGroup_unregister");
|
||||
RNA_def_struct_refine_func(srna, "rna_PropertyGroup_refine");
|
||||
|
||||
/* important so python types can have their name used in list views
|
||||
* however this isnt prefect because it overrides how python would set the name
|
||||
|
@ -360,20 +360,20 @@ static int rna_idproperty_verify_valid(PointerRNA *ptr, PropertyRNA *prop, IDPro
|
||||
}
|
||||
|
||||
static PropertyRNA *typemap[IDP_NUMTYPES] =
|
||||
{(PropertyRNA*)&rna_IDProperty_string,
|
||||
(PropertyRNA*)&rna_IDProperty_int,
|
||||
(PropertyRNA*)&rna_IDProperty_float,
|
||||
{(PropertyRNA*)&rna_PropertyGroupItem_string,
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_int,
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_float,
|
||||
NULL, NULL, NULL,
|
||||
(PropertyRNA*)&rna_IDProperty_group, NULL,
|
||||
(PropertyRNA*)&rna_IDProperty_double,
|
||||
(PropertyRNA*)&rna_IDProperty_idp_array};
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_group, NULL,
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_double,
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_idp_array};
|
||||
|
||||
static PropertyRNA *arraytypemap[IDP_NUMTYPES] =
|
||||
{NULL, (PropertyRNA*)&rna_IDProperty_int_array,
|
||||
(PropertyRNA*)&rna_IDProperty_float_array,
|
||||
{NULL, (PropertyRNA*)&rna_PropertyGroupItem_int_array,
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_float_array,
|
||||
NULL, NULL, NULL,
|
||||
(PropertyRNA*)&rna_IDProperty_collection, NULL,
|
||||
(PropertyRNA*)&rna_IDProperty_double_array};
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_collection, NULL,
|
||||
(PropertyRNA*)&rna_PropertyGroupItem_double_array};
|
||||
|
||||
IDProperty *rna_idproperty_check(PropertyRNA **prop, PointerRNA *ptr)
|
||||
{
|
||||
@ -3469,7 +3469,7 @@ char *RNA_path_from_ID_to_struct(PointerRNA *ptr)
|
||||
else
|
||||
return NULL; // can't do anything about this case yet...
|
||||
}
|
||||
else if (RNA_struct_is_a(ptr->type, &RNA_IDPropertyGroup)) {
|
||||
else if (RNA_struct_is_a(ptr->type, &RNA_PropertyGroup)) {
|
||||
/* special case, easier to deal with here then in ptr->type->path() */
|
||||
return rna_path_from_ID_to_idpgroup(ptr);
|
||||
}
|
||||
|
@ -764,7 +764,7 @@ static void rna_def_operator_stroke_element(BlenderRNA *brna)
|
||||
StructRNA *srna;
|
||||
PropertyRNA *prop;
|
||||
|
||||
srna= RNA_def_struct(brna, "OperatorStrokeElement", "IDPropertyGroup");
|
||||
srna= RNA_def_struct(brna, "OperatorStrokeElement", "PropertyGroup");
|
||||
RNA_def_struct_ui_text(srna, "Operator Stroke Element", "");
|
||||
|
||||
prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_XYZ);
|
||||
|
@ -191,10 +191,10 @@ void rna_ID_name_set(struct PointerRNA *ptr, const char *value);
|
||||
struct StructRNA *rna_ID_refine(struct PointerRNA *ptr);
|
||||
struct IDProperty *rna_ID_idprops(struct PointerRNA *ptr, int create);
|
||||
void rna_ID_fake_user_set(struct PointerRNA *ptr, int value);
|
||||
struct IDProperty *rna_IDPropertyGroup_idprops(struct PointerRNA *ptr, int create);
|
||||
void rna_IDPropertyGroup_unregister(const struct bContext *C, struct StructRNA *type);
|
||||
struct StructRNA *rna_IDPropertyGroup_register(struct bContext *C, struct ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
|
||||
struct StructRNA* rna_IDPropertyGroup_refine(struct PointerRNA *ptr);
|
||||
struct IDProperty *rna_PropertyGroup_idprops(struct PointerRNA *ptr, int create);
|
||||
void rna_PropertyGroup_unregister(const struct bContext *C, struct StructRNA *type);
|
||||
struct StructRNA *rna_PropertyGroup_register(struct bContext *C, struct ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
|
||||
struct StructRNA* rna_PropertyGroup_refine(struct PointerRNA *ptr);
|
||||
|
||||
void rna_object_vgroup_name_index_get(struct PointerRNA *ptr, char *value, int index);
|
||||
int rna_object_vgroup_name_index_length(struct PointerRNA *ptr, int index);
|
||||
@ -279,19 +279,19 @@ void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop);
|
||||
|
||||
/* ID Properties */
|
||||
|
||||
extern StringPropertyRNA rna_IDProperty_string;
|
||||
extern IntPropertyRNA rna_IDProperty_int;
|
||||
extern IntPropertyRNA rna_IDProperty_int_array;
|
||||
extern FloatPropertyRNA rna_IDProperty_float;
|
||||
extern FloatPropertyRNA rna_IDProperty_float_array;
|
||||
extern PointerPropertyRNA rna_IDProperty_group;
|
||||
extern CollectionPropertyRNA rna_IDProperty_collection;
|
||||
extern CollectionPropertyRNA rna_IDProperty_idp_array;
|
||||
extern FloatPropertyRNA rna_IDProperty_double;
|
||||
extern FloatPropertyRNA rna_IDProperty_double_array;
|
||||
extern StringPropertyRNA rna_PropertyGroupItem_string;
|
||||
extern IntPropertyRNA rna_PropertyGroupItem_int;
|
||||
extern IntPropertyRNA rna_PropertyGroupItem_int_array;
|
||||
extern FloatPropertyRNA rna_PropertyGroupItem_float;
|
||||
extern FloatPropertyRNA rna_PropertyGroupItem_float_array;
|
||||
extern PointerPropertyRNA rna_PropertyGroupItem_group;
|
||||
extern CollectionPropertyRNA rna_PropertyGroupItem_collection;
|
||||
extern CollectionPropertyRNA rna_PropertyGroupItem_idp_array;
|
||||
extern FloatPropertyRNA rna_PropertyGroupItem_double;
|
||||
extern FloatPropertyRNA rna_PropertyGroupItem_double_array;
|
||||
|
||||
extern StructRNA RNA_IDProperty;
|
||||
extern StructRNA RNA_IDPropertyGroup;
|
||||
extern StructRNA RNA_PropertyGroupItem;
|
||||
extern StructRNA RNA_PropertyGroup;
|
||||
|
||||
struct IDProperty *rna_idproperty_check(struct PropertyRNA **prop, struct PointerRNA *ptr);
|
||||
|
||||
|
@ -1268,7 +1268,7 @@ static void rna_def_operator_utils(BlenderRNA *brna)
|
||||
StructRNA *srna;
|
||||
PropertyRNA *prop;
|
||||
|
||||
srna= RNA_def_struct(brna, "OperatorMousePath", "IDPropertyGroup");
|
||||
srna= RNA_def_struct(brna, "OperatorMousePath", "PropertyGroup");
|
||||
RNA_def_struct_ui_text(srna, "Operator Mouse Path", "Mouse path values for operators that record such paths");
|
||||
|
||||
prop= RNA_def_property(srna, "loc", PROP_FLOAT, PROP_XYZ);
|
||||
@ -1286,7 +1286,7 @@ static void rna_def_operator_filelist_element(BlenderRNA *brna)
|
||||
StructRNA *srna;
|
||||
PropertyRNA *prop;
|
||||
|
||||
srna= RNA_def_struct(brna, "OperatorFileListElement", "IDPropertyGroup");
|
||||
srna= RNA_def_struct(brna, "OperatorFileListElement", "PropertyGroup");
|
||||
RNA_def_struct_ui_text(srna, "Operator File List Element", "");
|
||||
|
||||
|
||||
|
@ -207,7 +207,7 @@ void BPy_init_modules( void )
|
||||
BPY_rna_init();
|
||||
|
||||
PyModule_AddObject( mod, "types", BPY_rna_types() ); /* needs to be first so bpy_types can run */
|
||||
PyModule_AddObject(mod, "StructMetaIDProp", (PyObject *)&pyrna_struct_meta_idprop_Type); /* metaclass for idprop types, bpy_types.py needs access */
|
||||
PyModule_AddObject(mod, "StructMetaPropGroup", (PyObject *)&pyrna_struct_meta_idprop_Type); /* metaclass for idprop types, bpy_types.py needs access */
|
||||
|
||||
bpy_import_test("bpy_types");
|
||||
PyModule_AddObject( mod, "data", BPY_rna_module() ); /* imports bpy_types by running this */
|
||||
|
@ -742,17 +742,17 @@ static StructRNA *pointer_type_from_py(PyObject *value, const char *error_prefix
|
||||
if(PyErr_Occurred()) {
|
||||
PyObject *msg= PyC_ExceptionBuffer();
|
||||
char *msg_char= _PyUnicode_AsString(msg);
|
||||
PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from IDPropertyGroup, failed with: %s", error_prefix, msg_char);
|
||||
PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from PropertyGroup, failed with: %s", error_prefix, msg_char);
|
||||
Py_DECREF(msg);
|
||||
}
|
||||
else {
|
||||
PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from IDPropertyGroup, failed with type '%s'", error_prefix, Py_TYPE(value)->tp_name);
|
||||
PyErr_Format(PyExc_TypeError, "%.200s expected an RNA type derived from PropertyGroup, failed with type '%s'", error_prefix, Py_TYPE(value)->tp_name);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if(!RNA_struct_is_a(srna, &RNA_IDPropertyGroup)) {
|
||||
PyErr_Format(PyExc_SystemError, "%.200s expected an RNA type derived from IDPropertyGroup", error_prefix);
|
||||
if(!RNA_struct_is_a(srna, &RNA_PropertyGroup)) {
|
||||
PyErr_Format(PyExc_SystemError, "%.200s expected an RNA type derived from PropertyGroup", error_prefix);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -764,7 +764,7 @@ static char BPy_PointerProperty_doc[] =
|
||||
"\n"
|
||||
" Returns a new pointer property definition.\n"
|
||||
"\n"
|
||||
" :arg type: A subclass of :class:`bpy.types.IDPropertyGroup`.\n"
|
||||
" :arg type: A subclass of :class:`bpy.types.PropertyGroup`.\n"
|
||||
" :type type: class\n"
|
||||
BPY_PROPDEF_NAME_DOC
|
||||
BPY_PROPDEF_DESC_DOC
|
||||
@ -811,7 +811,7 @@ static char BPy_CollectionProperty_doc[] =
|
||||
"\n"
|
||||
" Returns a new collection property definition.\n"
|
||||
"\n"
|
||||
" :arg type: A subclass of :class:`bpy.types.IDPropertyGroup`.\n"
|
||||
" :arg type: A subclass of :class:`bpy.types.PropertyGroup`.\n"
|
||||
" :type type: class\n"
|
||||
BPY_PROPDEF_NAME_DOC
|
||||
BPY_PROPDEF_DESC_DOC
|
||||
|
Loading…
Reference in New Issue
Block a user