Revision: 18261
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18261
Author: blendix
Date: 2009-01-02 14:47:33 +0100 (Fri, 02 Jan 2009)
Log Message:
-----------
RNA
* Added skeleton code for particle/object_force/userdef.
* More Object properties wrapped.
* Added User Preferences display in outliner.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_controller.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_property.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.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_world.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object_force.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
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-02 11:06:27 UTC (rev 18260)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
2009-01-02 13:47:33 UTC (rev 18261)
@@ -567,6 +567,11 @@
ID *id= idv;
int a;
+ if(ELEM3(type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM)) {
+ id= ((PointerRNA*)idv)->id.data;
+ if(!id) id= ((PointerRNA*)idv)->data;
+ }
+
if(id==NULL) return NULL;
te= MEM_callocN(sizeof(TreeElement), "tree elem");
@@ -998,7 +1003,7 @@
/* we do lazy build, for speed and to avoid infinite recusion */
if(ptr->data == NULL) {
- te->name= "<null>";
+ te->name= "(empty)";
}
else if(type == TSE_RNA_STRUCT) {
/* struct */
@@ -1342,6 +1347,18 @@
tselem->flag &= ~TSE_CLOSED;
}
}
+ else if(soops->outlinevis==SO_USERDEF) {
+ PointerRNA userdefptr;
+
+ RNA_pointer_create(NULL, NULL, &RNA_UserPreferences, &U,
&userdefptr);
+
+ ten= outliner_add_element(soops, &soops->tree,
(void*)&userdefptr, NULL, TSE_RNA_STRUCT, -1);
+
+ if(show_opened) {
+ tselem= TREESTORE(ten);
+ tselem->flag &= ~TSE_CLOSED;
+ }
+ }
else {
ten= outliner_add_element(soops, &soops->tree, OBACT, NULL, 0,
0);
if(ten) ten->directdata= BASACT;
@@ -3179,8 +3196,10 @@
return ICON_LAMP;
else if(rnatype == &RNA_Group)
return ICON_GROUP;
- /*else if(rnatype == &RNA_Particle)
- return ICON_PARTICLES;*/
+ else if(rnatype == &RNA_ParticleSystem)
+ return ICON_PARTICLES;
+ else if(rnatype == &RNA_ParticleSettings)
+ return ICON_PARTICLES;
else if(rnatype == &RNA_Material)
return ICON_MATERIAL;
/*else if(rnatype == &RNA_Texture)
@@ -3686,7 +3705,7 @@
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // only once
- if(soops->outlinevis == SO_DATABLOCKS) {
+ if(ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
// struct marks
UI_ThemeColorShadeAlpha(TH_BACK, -15, -200);
//UI_ThemeColorShade(TH_BACK, -20);
@@ -4260,7 +4279,7 @@
block= uiBeginBlock(C, ar, "outliner buttons", UI_EMBOSS, UI_HELV);
outliner_buttons(block, ar, soops, &soops->tree);
- if(soops->outlinevis==SO_DATABLOCKS) {
+ if(ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
/* draw rna buttons */
outliner_rna_width(soops, &soops->tree, &sizex, 0);
outliner_draw_rnacols(ar, soops, sizex);
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
2009-01-02 11:06:27 UTC (rev 18260)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
2009-01-02 13:47:33 UTC (rev 18261)
@@ -201,14 +201,14 @@
if(soutliner->type==SO_OUTLINER) {
if(G.main->library.first)
- uiDefButS(block, MENU, B_REDR, "Outliner
Display%t|Libraries %x7|All Scenes %x0|Current Scene %x1|Visible Layers
%x2|Groups %x6|Same Types %x5|Selected %x3|Active %x4|Sequence %x10|Datablocks
%x11", xco, yco, 100, 20, &soutliner->outlinevis, 0, 0, 0, 0, "");
+ uiDefButS(block, MENU, B_REDR, "Outliner
Display%t|Libraries %x7|All Scenes %x0|Current Scene %x1|Visible Layers
%x2|Groups %x6|Same Types %x5|Selected %x3|Active %x4|Sequence %x10|Datablocks
%x11|User Preferences %x12", xco, yco, 120, 20, &soutliner->outlinevis, 0,
0, 0, 0, "");
else
- uiDefButS(block, MENU, B_REDR, "Outliner Display%t|All
Scenes %x0|Current Scene %x1|Visible Layers %x2|Groups %x6|Same Types
%x5|Selected %x3|Active %x4|Sequence %x10|Datablocks %x11", xco, yco,
100, 20, &soutliner->outlinevis, 0, 0, 0, 0, "");
+ uiDefButS(block, MENU, B_REDR, "Outliner Display%t|All
Scenes %x0|Current Scene %x1|Visible Layers %x2|Groups %x6|Same Types
%x5|Selected %x3|Active %x4|Sequence %x10|Datablocks %x11|User Preferences
%x12", xco, yco, 120, 20, &soutliner->outlinevis, 0, 0, 0, 0, "");
}
/* always as last */
- UI_view2d_totRect_set(&ar->v2d, xco+XIC+80,
ar->v2d.tot.ymax-ar->v2d.tot.ymin);
+ UI_view2d_totRect_set(&ar->v2d, xco+XIC+100,
ar->v2d.tot.ymax-ar->v2d.tot.ymin);
uiEndBlock(C, block);
uiDrawBlock(C, block);
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
2009-01-02 11:06:27 UTC (rev 18260)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h
2009-01-02 13:47:33 UTC (rev 18261)
@@ -656,6 +656,7 @@
#define SO_VERSE_MS 9
#define SO_SEQUENCE 10
#define SO_DATABLOCKS 11
+#define SO_USERDEF 12
/* SpaceOops->storeflag */
#define SO_TREESTORE_CLEANUP 1
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-01-02 11:06:27 UTC (rev 18260)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-01-02 13:47:33 UTC (rev 18261)
@@ -42,13 +42,13 @@
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_BlenderRNA;
extern StructRNA RNA_Bone;
extern StructRNA RNA_BooleanModifier;
extern StructRNA RNA_BooleanProperty;
-extern StructRNA RNA_BPoint;
extern StructRNA RNA_Brush;
extern StructRNA RNA_BuildModifier;
extern StructRNA RNA_Camera;
@@ -58,6 +58,7 @@
extern StructRNA RNA_CollectionProperty;
extern StructRNA RNA_CollisionModifier;
extern StructRNA RNA_CollisionSensor;
+extern StructRNA RNA_CollisionSettings;
extern StructRNA RNA_ColorSequence;
extern StructRNA RNA_Constraint;
extern StructRNA RNA_ControlFluidSettings;
@@ -77,6 +78,7 @@
extern StructRNA RNA_EnumPropertyItem;
extern StructRNA RNA_ExplodeModifier;
extern StructRNA RNA_ExpressionController;
+extern StructRNA RNA_FieldSettings;
extern StructRNA RNA_FloatProperty;
extern StructRNA RNA_FluidFluidSettings;
extern StructRNA RNA_FluidSettings;
@@ -85,6 +87,7 @@
extern StructRNA RNA_GameFloatProperty;
extern StructRNA RNA_GameIntProperty;
extern StructRNA RNA_GameProperty;
+extern StructRNA RNA_GameSoftBodySettings;
extern StructRNA RNA_GameStringProperty;
extern StructRNA RNA_GameTimeProperty;
extern StructRNA RNA_GlowSequence;
@@ -154,8 +157,11 @@
extern StructRNA RNA_Panel;
extern StructRNA RNA_ParticleFluidSettings;
extern StructRNA RNA_ParticleInstanceModifier;
+extern StructRNA RNA_ParticleSettings;
+extern StructRNA RNA_ParticleSystem;
extern StructRNA RNA_ParticleSystemModifier;
extern StructRNA RNA_PluginSequence;
+extern StructRNA RNA_PointCache;
extern StructRNA RNA_PointerProperty;
extern StructRNA RNA_Property;
extern StructRNA RNA_PropertySensor;
@@ -186,8 +192,10 @@
extern StructRNA RNA_ShrinkwrapModifier;
extern StructRNA RNA_SimpleDeformModifier;
extern StructRNA RNA_SmoothModifier;
+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_StringProperty;
@@ -195,11 +203,15 @@
extern StructRNA RNA_SubsurfModifier;
extern StructRNA RNA_Text;
extern StructRNA RNA_TextBox;
+extern StructRNA RNA_TextLine;
+extern StructRNA RNA_TextMarker;
extern StructRNA RNA_TouchSensor;
extern StructRNA RNA_TransformSequence;
extern StructRNA RNA_UVProjectModifier;
extern StructRNA RNA_UnknownType;
+extern StructRNA RNA_UserPreferences;
extern StructRNA RNA_VectorFont;
+extern StructRNA RNA_VertexGroup;
extern StructRNA RNA_WaveModifier;
extern StructRNA RNA_WindowManager;
extern StructRNA RNA_WipeSequence;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-01-02 11:06:27 UTC (rev 18260)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-01-02 13:47:33 UTC (rev 18261)
@@ -920,7 +920,9 @@
{"rna_modifier.c", RNA_def_modifier},
{"rna_nodetree.c", RNA_def_nodetree},
{"rna_object.c", RNA_def_object},
+ {"rna_object_force.c", RNA_def_object_force},
{"rna_packedfile.c", RNA_def_packedfile},
+ {"rna_particle.c", RNA_def_particle},
{"rna_property.c", RNA_def_gameproperty},
{"rna_radio.c", RNA_def_radio},
{"rna_rna.c", RNA_def_rna},
@@ -930,6 +932,7 @@
{"rna_sequence.c", RNA_def_sequence},
{"rna_text.c", RNA_def_text},
{"rna_sound.c", RNA_def_sound},
+ {"rna_userdef.c", RNA_def_userdef},
{"rna_vfont.c", RNA_def_vfont},
{"rna_wm.c", RNA_def_wm},
{"rna_world.c", RNA_def_world},
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
2009-01-02 11:06:27 UTC (rev 18260)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
2009-01-02 13:47:33 UTC (rev 18261)
@@ -24,7 +24,6 @@
#include <stdlib.h>
-#include "RNA_access.h"
#include "RNA_define.h"
#include "RNA_types.h"
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
2009-01-02 11:06:27 UTC (rev 18260)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
2009-01-02 13:47:33 UTC (rev 18261)
@@ -81,7 +81,6 @@
prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
RNA_def_property_float_sdna(prop, NULL, "rgb");
RNA_def_property_ui_text(prop, "Color", "");
- RNA_def_property_ui_range(prop, 0.0f , 1.0f, 10.0f, 3);
prop= RNA_def_property(srna, "opacity", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "alpha");
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
