archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rna context rename

Browse Source 
* context.main & bpy.types.Main --> context.blend_data & bpy.types.BlendData
* context.manager --> context.window_manager
This commit is contained in:
Campbell Barton
2010-09-02 04:53:05 +00:00
parent 6e1e638313
commit ddbfb05c84
24 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
release/scripts/modules/io_utils.py
View File

@@ -28,9 +28,9 @@ class ExportHelper:
def invoke(self, context, event): def invoke(self, context, event):
import os import os
if not self.properties.is_property_set("filepath"): if not self.properties.is_property_set("filepath"):
self.properties.filepath = os.path.splitext(context.main.filepath)[0] + self.filename_ext self.properties.filepath = os.path.splitext(context.blend_data.filepath)[0] + self.filename_ext
context.manager.add_fileselect(self) context.window_manager.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
@@ -38,8 +38,7 @@ class ImportHelper:
filepath = StringProperty(name="File Path", description="Filepath used for importing the file", maxlen= 1024, default= "", subtype='FILE_PATH') filepath = StringProperty(name="File Path", description="Filepath used for importing the file", maxlen= 1024, default= "", subtype='FILE_PATH')
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager context.window_manager.add_fileselect(self)
wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

2
release/scripts/op/console_python.py
View File

@@ -44,7 +44,7 @@ def get_console(console_id):
from code import InteractiveConsole from code import InteractiveConsole
consoles = getattr(get_console, "consoles", None) consoles = getattr(get_console, "consoles", None)
hash_next = hash(bpy.context.manager) hash_next = hash(bpy.context.window_manager)
if consoles is None: if consoles is None:
consoles = get_console.consoles = {} consoles = get_console.consoles = {}

2
release/scripts/op/nla.py
View File

@@ -169,7 +169,7 @@ class BakeAction(bpy.types.Operator):
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
return wm.invoke_props_dialog(self) return wm.invoke_props_dialog(self)

2
release/scripts/op/object.py
View File

@@ -59,7 +59,7 @@ class SelectPattern(bpy.types.Operator):
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
# return wm.invoke_props_popup(self, event) # return wm.invoke_props_popup(self, event)
wm.invoke_props_popup(self, event) wm.invoke_props_popup(self, event)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

2
release/scripts/op/presets.py
View File

@@ -64,7 +64,7 @@ class AddPresetBase():
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
#crashes, TODO - fix #crashes, TODO - fix
#return wm.invoke_props_popup(self, event) #return wm.invoke_props_popup(self, event)

2
release/scripts/op/uv.py
View File

@@ -207,7 +207,7 @@ class ExportUVLayout(bpy.types.Operator):
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
wm.add_fileselect(self) wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

6
release/scripts/op/wm.py
View File

@@ -449,7 +449,7 @@ class WM_OT_context_modal_mouse(bpy.types.Operator):
else: else:
self.properties.initial_x = event.mouse_x self.properties.initial_x = event.mouse_x
context.manager.add_modal_handler(self) context.window_manager.add_modal_handler(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
@@ -608,7 +608,7 @@ class WM_OT_doc_edit(bpy.types.Operator):
layout.prop(props, "doc_new", text="") layout.prop(props, "doc_new", text="")
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
return wm.invoke_props_dialog(self, width=600) return wm.invoke_props_dialog(self, width=600)
@@ -692,7 +692,7 @@ class WM_OT_properties_edit(bpy.types.Operator):
self.properties.max = prop_ui.get("max", 1000000000) self.properties.max = prop_ui.get("max", 1000000000)
self.properties.description = prop_ui.get("description", "") self.properties.description = prop_ui.get("description", "")
wm = context.manager wm = context.window_manager
# This crashes, TODO - fix # This crashes, TODO - fix
#return wm.invoke_props_popup(self, event) #return wm.invoke_props_popup(self, event)

2
release/scripts/presets/interaction/blender.py
View File

@@ -1,7 +1,7 @@
# Configuration Blender # Configuration Blender
import bpy import bpy
wm = bpy.context.manager wm = bpy.context.window_manager
wm.keyconfigs.active = wm.keyconfigs['Blender'] wm.keyconfigs.active = wm.keyconfigs['Blender']
bpy.context.user_preferences.view.use_mouse_auto_depth = False bpy.context.user_preferences.view.use_mouse_auto_depth = False

2
release/scripts/presets/interaction/maya.py
View File

@@ -1,7 +1,7 @@
# Configuration Maya # Configuration Maya
import bpy import bpy
wm = bpy.context.manager wm = bpy.context.window_manager
kc = wm.keyconfigs.new('Maya') kc = wm.keyconfigs.new('Maya')
# Map 3D View # Map 3D View

2
release/scripts/templates/operator.py
View File

@@ -38,7 +38,7 @@ class ExportSomeData(bpy.types.Operator):
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
if True: if True:
# File selector # File selector

2
release/scripts/templates/operator_modal.py
View File

@@ -25,7 +25,7 @@ class ModalOperator(bpy.types.Operator):
def invoke(self, context, event): def invoke(self, context, event):
if context.object: if context.object:
context.manager.add_modal_handler(self) context.window_manager.add_modal_handler(self)
self.properties.first_mouse_x = event.mouse_x self.properties.first_mouse_x = event.mouse_x
self.properties.first_value = context.object.location.x self.properties.first_value = context.object.location.x
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

2
release/scripts/templates/operator_modal_draw.py
View File

@@ -52,7 +52,7 @@ class ModalDrawOperator(bpy.types.Operator):
def invoke(self, context, event): def invoke(self, context, event):
if context.area.type == 'VIEW_3D': if context.area.type == 'VIEW_3D':
context.manager.add_modal_handler(self) context.window_manager.add_modal_handler(self)
# Add the region OpenGL drawing callback # Add the region OpenGL drawing callback
# draw in view space with 'POST_VIEW' and 'PRE_VIEW' # draw in view space with 'POST_VIEW' and 'PRE_VIEW'

2
release/scripts/templates/operator_modal_view3d.py
View File

@@ -39,7 +39,7 @@ class ViewOperator(bpy.types.Operator):
v3d = context.space_data v3d = context.space_data
rv3d = v3d.region_3d rv3d = v3d.region_3d
context.manager.add_modal_handler(self) context.window_manager.add_modal_handler(self)
if rv3d.view_perspective == 'CAMERA': if rv3d.view_perspective == 'CAMERA':
rv3d.view_perspective = 'PERSP' rv3d.view_perspective = 'PERSP'

2
release/scripts/ui/properties_data_armature_rigify.py
View File

@@ -250,7 +250,7 @@ class AsScript(bpy.types.Operator):
import os import os
obj = context.object obj = context.object
self.properties.filepath = os.path.splitext(bpy.data.filepath)[0] + "-" + bpy.path.clean_name(obj.name) + ".py" self.properties.filepath = os.path.splitext(bpy.data.filepath)[0] + "-" + bpy.path.clean_name(obj.name) + ".py"
wm = context.manager wm = context.window_manager
wm.add_fileselect(self) wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

2
release/scripts/ui/properties_scene.py
View File

@@ -314,7 +314,7 @@ class ANIM_OT_keying_set_export(bpy.types.Operator):
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
wm.add_fileselect(self) wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

2
release/scripts/ui/space_info.py
View File

@@ -26,7 +26,7 @@ class INFO_HT_header(bpy.types.Header):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
wm = context.manager wm = context.window_manager
window = context.window window = context.window
scene = context.scene scene = context.scene
rd = scene.render rd = scene.render

4
release/scripts/ui/space_userpref.py
View File

@@ -789,7 +789,7 @@ class USERPREF_PT_input(InputKeyMapPanel):
#start = time.time() #start = time.time()
userpref = context.user_preferences userpref = context.user_preferences
wm = context.manager wm = context.window_manager
inputs = userpref.inputs inputs = userpref.inputs
@@ -1183,7 +1183,7 @@ class WM_OT_addon_install(bpy.types.Operator):
self.report({'ERROR'}, "No 'addons' path could be found in " + str(bpy.utils.script_paths())) self.report({'ERROR'}, "No 'addons' path could be found in " + str(bpy.utils.script_paths()))
return {'CANCELLED'} return {'CANCELLED'}
wm = context.manager wm = context.window_manager
wm.add_fileselect(self) wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

32
release/scripts/ui/space_userpref_keymap.py
View File

@@ -352,7 +352,7 @@ class InputKeyMapPanel(bpy.types.Panel):
self.draw_entry(display_keymaps, entry, layout) self.draw_entry(display_keymaps, entry, layout)
def draw_keymaps(self, context, layout): def draw_keymaps(self, context, layout):
wm = context.manager wm = context.window_manager
kc = wm.keyconfigs.active kc = wm.keyconfigs.active
defkc = wm.keyconfigs.default defkc = wm.keyconfigs.default
@@ -486,7 +486,7 @@ class WM_OT_keyconfig_test(bpy.types.Operator):
return result return result
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.window_manager
kc = wm.keyconfigs.default kc = wm.keyconfigs.default
if self.testConfig(kc): if self.testConfig(kc):
@@ -552,23 +552,23 @@ class WM_OT_keyconfig_import(bpy.types.Operator):
shutil.move(self.properties.filepath, path) shutil.move(self.properties.filepath, path)
# sneaky way to check we're actually running the code. # sneaky way to check we're actually running the code.
wm = context.manager wm = context.window_manager
while config_name in wm.keyconfigs: while config_name in wm.keyconfigs:
wm.keyconfigs.remove(wm.keyconfigs[config_name]) wm.keyconfigs.remove(wm.keyconfigs[config_name])
wm = context.manager wm = context.window_manager
totmap = len(wm.keyconfigs) totmap = len(wm.keyconfigs)
mod = __import__(config_name) mod = __import__(config_name)
if totmap == len(wm.keyconfigs): if totmap == len(wm.keyconfigs):
reload(mod) reload(mod)
wm = bpy.context.manager wm = bpy.context.window_manager
wm.keyconfigs.active = wm.keyconfigs[config_name] wm.keyconfigs.active = wm.keyconfigs[config_name]
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
wm.add_fileselect(self) wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
@@ -594,7 +594,7 @@ class WM_OT_keyconfig_export(bpy.types.Operator):
if not f: if not f:
raise Exception("Could not open file") raise Exception("Could not open file")
wm = context.manager wm = context.window_manager
kc = wm.keyconfigs.active kc = wm.keyconfigs.active
if self.properties.kc_name != '': if self.properties.kc_name != '':
@@ -607,7 +607,7 @@ class WM_OT_keyconfig_export(bpy.types.Operator):
f.write("# Configuration %s\n" % name) f.write("# Configuration %s\n" % name)
f.write("import bpy\n\n") f.write("import bpy\n\n")
f.write("wm = bpy.context.manager\n") f.write("wm = bpy.context.window_manager\n")
f.write("kc = wm.keyconfigs.new('%s')\n\n" % name) f.write("kc = wm.keyconfigs.new('%s')\n\n" % name)
# Generate a list of keymaps to export: # Generate a list of keymaps to export:
@@ -667,7 +667,7 @@ class WM_OT_keyconfig_export(bpy.types.Operator):
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event): def invoke(self, context, event):
wm = context.manager wm = context.window_manager
wm.add_fileselect(self) wm.add_fileselect(self)
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
@@ -678,7 +678,7 @@ class WM_OT_keymap_edit(bpy.types.Operator):
bl_label = "Edit Key Map" bl_label = "Edit Key Map"
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.window_manager
km = context.keymap km = context.keymap
km.copy_to_user() km.copy_to_user()
return {'FINISHED'} return {'FINISHED'}
@@ -692,7 +692,7 @@ class WM_OT_keymap_restore(bpy.types.Operator):
all = BoolProperty(attr="all", name="All Keymaps", description="Restore all keymaps to default") all = BoolProperty(attr="all", name="All Keymaps", description="Restore all keymaps to default")
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.window_manager
if self.properties.all: if self.properties.all:
for km in wm.keyconfigs.default.keymaps: for km in wm.keyconfigs.default.keymaps:
@@ -712,7 +712,7 @@ class WM_OT_keyitem_restore(bpy.types.Operator):
item_id = IntProperty(attr="item_id", name="Item Identifier", description="Identifier of the item to remove") item_id = IntProperty(attr="item_id", name="Item Identifier", description="Identifier of the item to remove")
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.window_manager
km = context.keymap km = context.keymap
kmi = km.items.from_id(self.properties.item_id) kmi = km.items.from_id(self.properties.item_id)
@@ -727,7 +727,7 @@ class WM_OT_keyitem_add(bpy.types.Operator):
bl_label = "Add Key Map Item" bl_label = "Add Key Map Item"
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.window_manager
km = context.keymap km = context.keymap
kc = wm.keyconfigs.default kc = wm.keyconfigs.default
@@ -753,7 +753,7 @@ class WM_OT_keyitem_remove(bpy.types.Operator):
item_id = IntProperty(attr="item_id", name="Item Identifier", description="Identifier of the item to remove") item_id = IntProperty(attr="item_id", name="Item Identifier", description="Identifier of the item to remove")
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.window_manager
km = context.keymap km = context.keymap
kmi = km.items.from_id(self.properties.item_id) kmi = km.items.from_id(self.properties.item_id)
km.items.remove(kmi) km.items.remove(kmi)
@@ -767,12 +767,12 @@ class WM_OT_keyconfig_remove(bpy.types.Operator):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
wm = context.manager wm = context.window_manager
return wm.keyconfigs.active.is_user_defined return wm.keyconfigs.active.is_user_defined
def execute(self, context): def execute(self, context):
import sys import sys
wm = context.manager wm = context.window_manager
keyconfig = wm.keyconfigs.active keyconfig = wm.keyconfigs.active

2
source/blender/blenkernel/intern/context.c
View File

@@ -701,7 +701,7 @@ Main *CTX_data_main(const bContext *C)
{ {
Main *bmain; Main *bmain;
if(ctx_data_pointer_verify(C, "main", (void*)&bmain)) if(ctx_data_pointer_verify(C, "blend_data", (void*)&bmain))
return bmain; return bmain;
else else
return C->data.main; return C->data.main;

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

@@ -276,7 +276,7 @@ extern StructRNA RNA_LimitScaleConstraint;
extern StructRNA RNA_LockedTrackConstraint; extern StructRNA RNA_LockedTrackConstraint;
extern StructRNA RNA_Macro; extern StructRNA RNA_Macro;
extern StructRNA RNA_MagicTexture; extern StructRNA RNA_MagicTexture;
extern StructRNA RNA_Main; extern StructRNA RNA_BlendData;
extern StructRNA RNA_MarbleTexture; extern StructRNA RNA_MarbleTexture;
extern StructRNA RNA_MaskModifier; extern StructRNA RNA_MaskModifier;
extern StructRNA RNA_Material; extern StructRNA RNA_Material;

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

@@ -95,7 +95,7 @@ PointerRNA PointerRNA_NULL = {{0}, 0, 0};
void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr) void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr)
{ {
r_ptr->id.data= NULL; r_ptr->id.data= NULL;
r_ptr->type= &RNA_Main; r_ptr->type= &RNA_BlendData;
r_ptr->data= main; r_ptr->data= main;
} }

8
source/blender/makesrna/intern/rna_context.c
View File

@@ -93,7 +93,7 @@ static PointerRNA rna_Context_region_data_get(PointerRNA *ptr)
static PointerRNA rna_Context_main_get(PointerRNA *ptr) static PointerRNA rna_Context_main_get(PointerRNA *ptr)
{ {
bContext *C= (bContext*)ptr->data; 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) static PointerRNA rna_Context_scene_get(PointerRNA *ptr)
@@ -151,7 +151,7 @@ void RNA_def_context(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "bContext"); RNA_def_struct_sdna(srna, "bContext");
/* WM */ /* 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_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_struct_type(prop, "WindowManager"); RNA_def_property_struct_type(prop, "WindowManager");
RNA_def_property_pointer_funcs(prop, "rna_Context_manager_get", NULL, NULL, NULL); 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); RNA_def_property_pointer_funcs(prop, "rna_Context_region_data_get", NULL, NULL, NULL);
/* Data */ /* 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_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); RNA_def_property_pointer_funcs(prop, "rna_Context_main_get", NULL, NULL, NULL);
prop= RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE); prop= RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE);

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

@@ -302,8 +302,8 @@ void RNA_def_main(BlenderRNA *brna)
int i; int i;
srna= RNA_def_struct(brna, "Main", NULL); srna= RNA_def_struct(brna, "BlendData", NULL);
RNA_def_struct_ui_text(srna, "Main", "Main data structure representing a .blend file and all its datablocks"); 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); RNA_def_struct_ui_icon(srna, ICON_BLENDER);
prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);

2
source/blender/modifiers/intern/MOD_screw.c
View File

@@ -436,7 +436,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
vc= vert_connect; vc= vert_connect;
for (i=0; i < totvert; i++, vc++) { for (i=0; i < totvert; i++, vc++) {
int v_best=-1, ed_loop_closed=0; /* vert and vert new */ int v_best=-1, ed_loop_closed=0; /* vert and vert new */
int ed_loop_flip; int ed_loop_flip= 0; /* compiler complains if not initialized, but it should be initialized below */
float fl= -1.0f; float fl= -1.0f;
ScrewVertIter lt_iter; ScrewVertIter lt_iter;