[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34890] trunk/blender: rename IDPropertyGroup to PropertyGroup

Campbell Barton ideasman42 at gmail.com
Wed Feb 16 03:51:57 CET 2011


Revision: 34890
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34890
Author:   campbellbarton
Date:     2011-02-16 02:51:56 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
rename IDPropertyGroup to PropertyGroup
also renamed IDProperty to PropertyGroupItem (these are not referenced for common usage and we already have 'Property' defined).

Modified Paths:
--------------
    trunk/blender/intern/tools/bpy_introspect_ui.py
    trunk/blender/release/scripts/io/netrender/ui.py
    trunk/blender/release/scripts/modules/bpy_types.py
    trunk/blender/source/blender/makesrna/RNA_access.h
    trunk/blender/source/blender/makesrna/intern/rna_ID.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/makesrna/intern/rna_brush.c
    trunk/blender/source/blender/makesrna/intern/rna_internal.h
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/python/intern/bpy.c
    trunk/blender/source/blender/python/intern/bpy_props.c

Modified: trunk/blender/intern/tools/bpy_introspect_ui.py
===================================================================
--- trunk/blender/intern/tools/bpy_introspect_ui.py	2011-02-16 02:25:03 UTC (rev 34889)
+++ trunk/blender/intern/tools/bpy_introspect_ui.py	2011-02-16 02:51:56 UTC (rev 34890)
@@ -193,7 +193,7 @@
     pass
 
 
-class IDPropertyGroup():
+class PropertyGroup():
     pass
 
 
@@ -205,7 +205,7 @@
     bpy.types.Panel = Panel
     bpy.types.Header = Header
     bpy.types.Menu = Menu
-    bpy.types.IDPropertyGroup = IDPropertyGroup
+    bpy.types.PropertyGroup = PropertyGroup
     bpy.types.Operator = Operator
 
     bpy.types.Armature = type("Armature", (), {})

Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py	2011-02-16 02:25:03 UTC (rev 34889)
+++ trunk/blender/release/scripts/io/netrender/ui.py	2011-02-16 02:51:56 UTC (rev 34890)
@@ -365,13 +365,13 @@
 
 
 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)

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2011-02-16 02:25:03 UTC (rev 34889)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2011-02-16 02:51:56 UTC (rev 34890)
@@ -23,7 +23,7 @@
 from mathutils import Vector
 
 StructRNA = bpy_types.Struct.__bases__[0]
-StructMetaIDProp = _bpy.StructMetaIDProp
+StructMetaPropGroup = _bpy.StructMetaPropGroup
 # StructRNA = bpy_types.Struct
 
 
@@ -258,15 +258,15 @@
         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 @@
 import collections
 
 
-class RNAMetaIDProp(RNAMeta, StructMetaIDProp):
+class RNAMetaPropGroup(RNAMeta, StructMetaPropGroup):
     pass
 
 
@@ -637,7 +637,7 @@
         return ops.macro_define(self, opname)
 
 
-class IDPropertyGroup(StructRNA, metaclass=RNAMetaIDProp):
+class PropertyGroup(StructRNA, metaclass=RNAMetaPropGroup):
         __slots__ = ()
 
 

Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h	2011-02-16 02:25:03 UTC (rev 34889)
+++ trunk/blender/source/blender/makesrna/RNA_access.h	2011-02-16 02:51:56 UTC (rev 34890)
@@ -43,7 +43,6 @@
 /* Types */
 
 extern BlenderRNA BLENDER_RNA;
-
 extern StructRNA RNA_Action;
 extern StructRNA RNA_ActionConstraint;
 extern StructRNA RNA_ActionGroup;
@@ -66,8 +65,9 @@
 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_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_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_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_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_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_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_Itasc;
 extern StructRNA RNA_JoystickSensor;
 extern StructRNA RNA_Key;
-extern StructRNA RNA_KeyboardSensor;
 extern StructRNA RNA_KeyConfig;
+extern StructRNA RNA_KeyMap;
+extern StructRNA RNA_KeyMapItem;
+extern StructRNA RNA_KeyboardSensor;
 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_KeyingSetPath;
 extern StructRNA RNA_KinematicConstraint;
 extern StructRNA RNA_Lamp;
 extern StructRNA RNA_LampSkySettings;
@@ -277,7 +275,6 @@
 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_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_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_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_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_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_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_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;

Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c	2011-02-16 02:25:03 UTC (rev 34889)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c	2011-02-16 02:51:56 UTC (rev 34890)
@@ -200,22 +200,22 @@
 	}
 }
 
-IDProperty *rna_IDPropertyGroup_idprops(PointerRNA *ptr, int create)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list