[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18448] branches/blender2.5/blender/source /blender: RNA
Brecht Van Lommel
brecht at blender.org
Sat Jan 10 23:57:36 CET 2009
Revision: 18448
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18448
Author: blendix
Date: 2009-01-10 23:57:33 +0100 (Sat, 10 Jan 2009)
Log Message:
-----------
RNA
* Finished DNA_lamp_types.h, DNA_world_types.h and DNA_sound_types.h.
* Renamed "parent" struct property to "nested", and also remaining "from"
usage to "base".
* Added a NEVER_NULL subtype for pointers and use it for all properties
that apply.
* Make sure all structs have a description, and fix any other DOC_BROKEN
descriptions, also many other naming consistency improvements.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_controller.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_group.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ipo.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_lattice.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_mesh.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object_force.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_property.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_screen.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scriptlink.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sensor.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sound.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_text.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_vfont.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_wm.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_world.c
branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-01-10 19:45:48 UTC (rev 18447)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-01-10 22:57:33 UTC (rev 18448)
@@ -3183,8 +3183,10 @@
return ICON_FACESEL;
else if(rnatype == &RNA_MeshTextureFace)
return ICON_FACESEL_HLT;
- else if(rnatype == &RNA_MeshVertexGroup)
+ else if(rnatype == &RNA_VertexGroup)
return ICON_VGROUP;
+ else if(rnatype == &RNA_VertexGroupElement)
+ return ICON_VGROUP;
else if(rnatype == &RNA_Curve)
return ICON_CURVE;
else if(rnatype == &RNA_MetaBall)
@@ -3199,6 +3201,16 @@
return ICON_BONE_DEHLT;
else if(rnatype == &RNA_Camera)
return ICON_CAMERA;
+ else if(rnatype == &RNA_LocalLamp)
+ return ICON_LAMP;
+ else if(rnatype == &RNA_AreaLamp)
+ return ICON_LAMP;
+ else if(rnatype == &RNA_SpotLamp)
+ return ICON_LAMP;
+ else if(rnatype == &RNA_SunLamp)
+ return ICON_LAMP;
+ else if(rnatype == &RNA_HemiLamp)
+ return ICON_LAMP;
else if(rnatype == &RNA_Lamp)
return ICON_LAMP;
else if(rnatype == &RNA_Group)
@@ -3211,6 +3223,12 @@
return ICON_MATERIAL;
else if(rnatype == &RNA_Texture)
return ICON_TEXTURE;
+ else if(rnatype == &RNA_TextureSlot)
+ return ICON_TEXTURE;
+ else if(rnatype == &RNA_WorldTextureSlot)
+ return ICON_TEXTURE;
+ else if(rnatype == &RNA_MaterialTextureSlot)
+ return ICON_TEXTURE;
else if(rnatype == &RNA_Image)
return ICON_TEXTURE;
else if(rnatype == &RNA_Screen)
@@ -3253,7 +3271,7 @@
return ICON_RNA;
else if(rnatype == &RNA_CollectionProperty)
return ICON_RNA;
- else if(rnatype == &RNA_ObjectGameSettings)
+ else if(rnatype == &RNA_GameObjectSettings)
return ICON_GAME;
else if(rnatype == &RNA_ScriptLink)
return ICON_PYTHON;
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2009-01-10 19:45:48 UTC (rev 18447)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2009-01-10 22:57:33 UTC (rev 18448)
@@ -42,12 +42,13 @@
extern StructRNA RNA_ActuatorSensor;
extern StructRNA RNA_AlwaysSensor;
extern StructRNA RNA_AndController;
+extern StructRNA RNA_Area;
+extern StructRNA RNA_AreaLamp;
extern StructRNA RNA_Armature;
extern StructRNA RNA_ArmatureModifier;
extern StructRNA RNA_ArrayModifier;
-extern StructRNA RNA_BPoint;
extern StructRNA RNA_BevelModifier;
-extern StructRNA RNA_BezTriple;
+extern StructRNA RNA_BezierCurvePoint;
extern StructRNA RNA_BlenderRNA;
extern StructRNA RNA_Bone;
extern StructRNA RNA_BooleanModifier;
@@ -56,7 +57,6 @@
extern StructRNA RNA_BuildModifier;
extern StructRNA RNA_Camera;
extern StructRNA RNA_CastModifier;
-extern StructRNA RNA_CharInfo;
extern StructRNA RNA_ClothCollisionSettings;
extern StructRNA RNA_ClothModifier;
extern StructRNA RNA_ClothSettings;
@@ -75,6 +75,7 @@
extern StructRNA RNA_CurveMapPoint;
extern StructRNA RNA_CurveMapping;
extern StructRNA RNA_CurveModifier;
+extern StructRNA RNA_CurvePoint;
extern StructRNA RNA_DecimateModifier;
extern StructRNA RNA_DelaySensor;
extern StructRNA RNA_DisplaceModifier;
@@ -94,12 +95,14 @@
extern StructRNA RNA_GameBooleanProperty;
extern StructRNA RNA_GameFloatProperty;
extern StructRNA RNA_GameIntProperty;
+extern StructRNA RNA_GameObjectSettings;
extern StructRNA RNA_GameProperty;
extern StructRNA RNA_GameSoftBodySettings;
extern StructRNA RNA_GameStringProperty;
-extern StructRNA RNA_GameTimeProperty;
+extern StructRNA RNA_GameTimerProperty;
extern StructRNA RNA_GlowSequence;
extern StructRNA RNA_Group;
+extern StructRNA RNA_HemiLamp;
extern StructRNA RNA_HookModifier;
extern StructRNA RNA_ID;
extern StructRNA RNA_IDProperty;
@@ -116,35 +119,39 @@
extern StructRNA RNA_Key;
extern StructRNA RNA_KeyboardSensor;
extern StructRNA RNA_Lamp;
+extern StructRNA RNA_LampSkySettings;
+extern StructRNA RNA_LampTextureSlot;
extern StructRNA RNA_Lattice;
extern StructRNA RNA_LatticeModifier;
extern StructRNA RNA_LatticePoint;
extern StructRNA RNA_Library;
-extern StructRNA RNA_MCol;
-extern StructRNA RNA_MColLayer;
-extern StructRNA RNA_MFloatProperty;
-extern StructRNA RNA_MFloatPropertyLayer;
-extern StructRNA RNA_MIntProperty;
-extern StructRNA RNA_MIntPropertyLayer;
-extern StructRNA RNA_MSticky;
-extern StructRNA RNA_MStringProperty;
-extern StructRNA RNA_MStringPropertyLayer;
+extern StructRNA RNA_LocalLamp;
extern StructRNA RNA_Main;
extern StructRNA RNA_MaskModifier;
extern StructRNA RNA_Material;
extern StructRNA RNA_MaterialHalo;
extern StructRNA RNA_MaterialRaytraceMirror;
extern StructRNA RNA_MaterialRaytraceTransparency;
+extern StructRNA RNA_MaterialStrand;
extern StructRNA RNA_MaterialSubsurfaceScattering;
+extern StructRNA RNA_MaterialTextureSlot;
extern StructRNA RNA_Mesh;
+extern StructRNA RNA_MeshColor;
+extern StructRNA RNA_MeshColorLayer;
extern StructRNA RNA_MeshDeformModifier;
extern StructRNA RNA_MeshEdge;
extern StructRNA RNA_MeshFace;
+extern StructRNA RNA_MeshFloatProperty;
+extern StructRNA RNA_MeshFloatPropertyLayer;
+extern StructRNA RNA_MeshIntProperty;
+extern StructRNA RNA_MeshIntPropertyLayer;
extern StructRNA RNA_MeshMultires;
+extern StructRNA RNA_MeshSticky;
+extern StructRNA RNA_MeshStringProperty;
+extern StructRNA RNA_MeshStringPropertyLayer;
extern StructRNA RNA_MeshTextureFace;
extern StructRNA RNA_MeshTextureFaceLayer;
extern StructRNA RNA_MeshVertex;
-extern StructRNA RNA_MeshVertexGroup;
extern StructRNA RNA_MessageSensor;
extern StructRNA RNA_MetaBall;
extern StructRNA RNA_MetaElement;
@@ -160,7 +167,6 @@
extern StructRNA RNA_NodeTree;
extern StructRNA RNA_NorController;
extern StructRNA RNA_Object;
-extern StructRNA RNA_ObjectGameSettings;
extern StructRNA RNA_ObstacleFluidSettings;
extern StructRNA RNA_Operator;
extern StructRNA RNA_OperatorMousePath;
@@ -189,9 +195,6 @@
extern StructRNA RNA_Region;
extern StructRNA RNA_Scene;
extern StructRNA RNA_SceneSequence;
-extern StructRNA RNA_ScrArea;
-extern StructRNA RNA_ScrEdge;
-extern StructRNA RNA_ScrVert;
extern StructRNA RNA_Screen;
extern StructRNA RNA_ScriptLink;
extern StructRNA RNA_Sensor;
@@ -212,15 +215,16 @@
extern StructRNA RNA_SoftBodySettings;
extern StructRNA RNA_SoftbodyModifier;
extern StructRNA RNA_Sound;
-extern StructRNA RNA_SoundListener;
extern StructRNA RNA_SoundSequence;
extern StructRNA RNA_SpeedControlSequence;
+extern StructRNA RNA_SpotLamp;
extern StructRNA RNA_StringProperty;
extern StructRNA RNA_Struct;
extern StructRNA RNA_SubsurfModifier;
-extern StructRNA RNA_SunskySettings;
+extern StructRNA RNA_SunLamp;
extern StructRNA RNA_Text;
extern StructRNA RNA_TextBox;
+extern StructRNA RNA_TextCharacterFormat;
extern StructRNA RNA_TextLine;
extern StructRNA RNA_TextMarker;
extern StructRNA RNA_Texture;
@@ -250,11 +254,15 @@
extern StructRNA RNA_UserSolidLight;
extern StructRNA RNA_VectorFont;
extern StructRNA RNA_VertexGroup;
+extern StructRNA RNA_VertexGroupElement;
extern StructRNA RNA_WaveModifier;
extern StructRNA RNA_WindowManager;
extern StructRNA RNA_WipeSequence;
extern StructRNA RNA_World;
extern StructRNA RNA_WorldAmbientOcclusion;
+extern StructRNA RNA_WorldMistSettings;
+extern StructRNA RNA_WorldStarsSettings;
+extern StructRNA RNA_WorldTextureSlot;
extern StructRNA RNA_XnorController;
extern StructRNA RNA_XorController;
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_define.h 2009-01-10 19:45:48 UTC (rev 18447)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_define.h 2009-01-10 22:57:33 UTC (rev 18448)
@@ -43,7 +43,7 @@
void RNA_def_struct_sdna(StructRNA *srna, const char *structname);
void RNA_def_struct_sdna_from(StructRNA *srna, const char *structname, const char *propname);
void RNA_def_struct_name_property(StructRNA *srna, PropertyRNA *prop);
-void RNA_def_struct_parent(StructRNA *srna, StructRNA *parent);
+void RNA_def_struct_nested(BlenderRNA *brna, StructRNA *srna, const char *structname);
void RNA_def_struct_flag(StructRNA *srna, int flag);
void RNA_def_struct_refine_func(StructRNA *srna, const char *refine);
void RNA_def_struct_identifier(StructRNA *srna, const char *identifier);
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_types.h 2009-01-10 19:45:48 UTC (rev 18447)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_types.h 2009-01-10 22:57:33 UTC (rev 18448)
@@ -66,7 +66,8 @@
PROP_COLOR = 4,
PROP_VECTOR = 5,
PROP_MATRIX = 6,
- PROP_ROTATION = 7
+ PROP_ROTATION = 7,
+ PROP_NEVER_NULL = 8
} PropertySubType;
typedef enum PropertyFlag {
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2009-01-10 19:45:48 UTC (rev 18447)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2009-01-10 22:57:33 UTC (rev 18448)
@@ -647,6 +647,7 @@
case PROP_VECTOR: return "PROP_VECTOR";
case PROP_MATRIX: return "PROP_MATRIX";
case PROP_ROTATION: return "PROP_ROTATION";
+ case PROP_NEVER_NULL: return "PROP_NEVER_NULL";
default: return "PROP_UNKNOWN";
}
}
@@ -880,10 +881,10 @@
fprintf(f, "(PropertyRNA*)&rna_%s_rna_properties,\n", srna->identifier);
- if(srna->from) fprintf(f, "\t&RNA_%s,\n", (char*)srna->from);
+ if(srna->base) fprintf(f, "\t&RNA_%s,\n", srna->base->identifier);
else fprintf(f, "\tNULL,\n");
- if(srna->parent) fprintf(f, "\t&RNA_%s,\n", (char*)srna->parent);
+ if(srna->nested) fprintf(f, "\t&RNA_%s,\n", srna->nested->identifier);
else fprintf(f, "\tNULL,\n");
fprintf(f, "\t%s,\n", rna_function_string(srna->refine));
@@ -908,6 +909,7 @@
RNAProcessItem PROCESS_ITEMS[]= {
{"rna_ID.c", RNA_def_ID},
+ {"rna_texture.c", RNA_def_texture},
{"rna_action.c", RNA_def_action},
{"rna_actuator.c", RNA_def_actuator},
{"rna_armature.c", RNA_def_armature},
@@ -945,7 +947,6 @@
{"rna_sensor.c", RNA_def_sensor},
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list