diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-02 08:53:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-02 08:53:05 +0400 |
| commit | ddbfb05c84d1b20df82d8b1264d897dd55006695 (patch) | |
| tree | 6cbd6cbc0201aa69c60af750527c114733acfcb8 /source/blender/makesrna/intern | |
| parent | 6e1e6383135689091d9d43462d86a8090ab5b82b (diff) | |
rna context rename
* context.main & bpy.types.Main --> context.blend_data & bpy.types.BlendData
* context.manager --> context.window_manager
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_context.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 4be9502d79a..51ad6e55ddd 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -95,7 +95,7 @@ PointerRNA PointerRNA_NULL = {{0}, 0, 0}; void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr) { r_ptr->id.data= NULL; - r_ptr->type= &RNA_Main; + r_ptr->type= &RNA_BlendData; r_ptr->data= main; } diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c index 6cc93d088ad..ebe0e363b26 100644 --- a/source/blender/makesrna/intern/rna_context.c +++ b/source/blender/makesrna/intern/rna_context.c @@ -93,7 +93,7 @@ static PointerRNA rna_Context_region_data_get(PointerRNA *ptr) static PointerRNA rna_Context_main_get(PointerRNA *ptr) { bContext *C= (bContext*)ptr->data; - return rna_pointer_inherit_refine(ptr, &RNA_Main, CTX_data_main(C)); + return rna_pointer_inherit_refine(ptr, &RNA_BlendData, CTX_data_main(C)); } static PointerRNA rna_Context_scene_get(PointerRNA *ptr) @@ -151,7 +151,7 @@ void RNA_def_context(BlenderRNA *brna) RNA_def_struct_sdna(srna, "bContext"); /* WM */ - prop= RNA_def_property(srna, "manager", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "window_manager", PROP_POINTER, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "WindowManager"); RNA_def_property_pointer_funcs(prop, "rna_Context_manager_get", NULL, NULL, NULL); @@ -187,9 +187,9 @@ void RNA_def_context(BlenderRNA *brna) RNA_def_property_pointer_funcs(prop, "rna_Context_region_data_get", NULL, NULL, NULL); /* Data */ - prop= RNA_def_property(srna, "main", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "blend_data", PROP_POINTER, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_struct_type(prop, "Main"); + RNA_def_property_struct_type(prop, "BlendData"); RNA_def_property_pointer_funcs(prop, "rna_Context_main_get", NULL, NULL, NULL); prop= RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index b59f23d3e1f..99758b8f0fe 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -302,8 +302,8 @@ void RNA_def_main(BlenderRNA *brna) int i; - srna= RNA_def_struct(brna, "Main", NULL); - RNA_def_struct_ui_text(srna, "Main", "Main data structure representing a .blend file and all its datablocks"); + srna= RNA_def_struct(brna, "BlendData", NULL); + RNA_def_struct_ui_text(srna, "Blendfile Data", "Main data structure representing a .blend file and all its datablocks"); RNA_def_struct_ui_icon(srna, ICON_BLENDER); prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); |