bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

RNA

Browse Source 
* DNA_text_types.h done, patch by Roelf de Kock.
* Minor naming fixes in RNA-RNA.
This commit is contained in:
Brecht Van Lommel 2008-12-31 15:02:40 +00:00
parent ba91587183
commit b65a3e9337
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_outliner/outliner.c
View File

@ -3180,19 +3180,19 @@ static int tselem_rna_icon(PointerRNA *ptr)
else if(rnatype == &RNA_Group)
return ICON_GROUP;
/*else if(rnatype == &RNA_Particle)
return ICON_PARTICLES);*/
return ICON_PARTICLES;*/
else if(rnatype == &RNA_Material)
return ICON_MATERIAL;
/*else if(rnatype == &RNA_Texture)
return ICON_TEXTURE);*/
return ICON_TEXTURE;*/
else if(rnatype == &RNA_Image)
return ICON_TEXTURE;
else if(rnatype == &RNA_Screen)
return ICON_SPLITSCREEN;
else if(rnatype == &RNA_NodeTree)
return ICON_NODE;
/*else if(rnatype == &RNA_Text)
return ICON_TEXT);*/
else if(rnatype == &RNA_Text)
return ICON_TEXT;
else if(rnatype == &RNA_Sound)
return ICON_SOUND;
else if(rnatype == &RNA_Brush)
@ -3200,7 +3200,7 @@ static int tselem_rna_icon(PointerRNA *ptr)
else if(rnatype == &RNA_Library)
return ICON_LIBRARY_DEHLT;
/*else if(rnatype == &RNA_Action)
return ICON_ACTION);*/
return ICON_ACTION;*/
else if(rnatype == &RNA_Ipo)
return ICON_IPO_DEHLT;
else if(rnatype == &RNA_Key)
@ -3217,6 +3217,8 @@ static int tselem_rna_icon(PointerRNA *ptr)
return ICON_RNA;
else if(rnatype == &RNA_FloatProperty)
return ICON_RNA;
else if(rnatype == &RNA_StringProperty)
return ICON_RNA;
else if(rnatype == &RNA_EnumProperty)
return ICON_RNA;
else if(rnatype == &RNA_EnumPropertyItem)

1
source/blender/makesrna/RNA_access.h
View File

@ -192,6 +192,7 @@ extern StructRNA RNA_SpeedControlSequence;
extern StructRNA RNA_StringProperty;
extern StructRNA RNA_Struct;
extern StructRNA RNA_SubsurfModifier;
extern StructRNA RNA_Text;
extern StructRNA RNA_TextBox;
extern StructRNA RNA_TouchSensor;
extern StructRNA RNA_TransformSequence;

1
source/blender/makesrna/intern/makesrna.c
View File

@ -928,6 +928,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
{"rna_screen.c", RNA_def_screen},
{"rna_sensor.c", RNA_def_sensor},
{"rna_sequence.c", RNA_def_sequence},
{"rna_text.c", RNA_def_text},
{"rna_sound.c", RNA_def_sound},
{"rna_vfont.c", RNA_def_vfont},
{"rna_wm.c", RNA_def_wm},

1
source/blender/makesrna/intern/rna_ID.c
View File

@ -77,6 +77,7 @@ static StructRNA *rna_ID_refine(PointerRNA *ptr)
case ID_SCE: return &RNA_Scene;
case ID_SCR: return &RNA_Screen;
case ID_SO: return &RNA_Sound;
case ID_TXT: return &RNA_Text;
case ID_VF: return &RNA_VectorFont;
case ID_WO: return &RNA_World;
case ID_WM: return &RNA_WindowManager;

1
source/blender/makesrna/intern/rna_internal.h
View File

@ -125,6 +125,7 @@ void RNA_def_scene(struct BlenderRNA *brna);
void RNA_def_screen(struct BlenderRNA *brna);
void RNA_def_sensor(struct BlenderRNA *brna);
void RNA_def_sequence(struct BlenderRNA *brna);
void RNA_def_text(struct BlenderRNA *brna);
void RNA_def_sound(struct BlenderRNA *brna);
void RNA_def_vfont(struct BlenderRNA *brna);
void RNA_def_wm(struct BlenderRNA *brna);

2
source/blender/makesrna/intern/rna_main.c
View File

@ -243,7 +243,7 @@ void RNA_def_main(BlenderRNA *brna)
{"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks."},
{"keys", "ID", "rna_Main_key_begin", "Keys", "Key datablocks."},
{"scripts", "ID", "rna_Main_script_begin", "Scripts", "Script datablocks."},
{"texts", "ID", "rna_Main_text_begin", "Texts", "Text datablocks."},
{"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks."},
{"sounds", "ID", "rna_Main_sound_begin", "Sounds", "Sound datablocks."},
{"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature datablocks."},
{"actions", "ID", "rna_Main_action_begin", "Actions", "Action datablocks."},

12
source/blender/makesrna/intern/rna_rna.c
View File

@ -242,10 +242,10 @@ static int rna_Property_subtype_get(PointerRNA *ptr)
return prop->subtype;
}
static int rna_Property_readonly_get(PointerRNA *ptr)
static int rna_Property_editable_get(PointerRNA *ptr)
{
PropertyRNA *prop= (PropertyRNA*)ptr->data;
return RNA_property_editable(ptr, prop) ? 0 : 1;
return RNA_property_editable(ptr, prop);
}
static int rna_Property_array_length_get(PointerRNA *ptr)
@ -420,7 +420,7 @@ static void rna_def_struct(BlenderRNA *brna)
prop= RNA_def_property(srna, "description", PROP_STRING, PROP_NONE);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_string_funcs(prop, "rna_Struct_description_get", "rna_Struct_description_length", NULL);
RNA_def_property_ui_text(prop, "description", "This field explains the Struct's purpose");
RNA_def_property_ui_text(prop, "Description", "Description of the Struct's purpose.");
prop= RNA_def_property(srna, "base", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
@ -497,10 +497,10 @@ static void rna_def_property(BlenderRNA *brna)
RNA_def_property_enum_funcs(prop, "rna_Property_subtype_get", NULL);
RNA_def_property_ui_text(prop, "Subtype", "Semantic interpretation of the property.");
prop= RNA_def_property(srna, "readonly", PROP_INT, PROP_NONE);
prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_int_funcs(prop, "rna_Property_readonly_get", NULL, NULL);
RNA_def_property_ui_text(prop, "Read Only", "Read Only setting for this property");
RNA_def_property_boolean_funcs(prop, "rna_Property_editable_get", NULL);
RNA_def_property_ui_text(prop, "Editable", "Property is editable through RNA.");
}
static void rna_def_number_property(StructRNA *srna, PropertyType type)