[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31713] trunk/blender: rna context rename
Campbell Barton
ideasman42 at gmail.com
Thu Sep 2 06:53:06 CEST 2010
Revision: 31713
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31713
Author: campbellbarton
Date: 2010-09-02 06:53:05 +0200 (Thu, 02 Sep 2010)
Log Message:
-----------
rna context rename
* context.main & bpy.types.Main --> context.blend_data & bpy.types.BlendData
* context.manager --> context.window_manager
Modified Paths:
--------------
trunk/blender/release/scripts/modules/io_utils.py
trunk/blender/release/scripts/op/console_python.py
trunk/blender/release/scripts/op/nla.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/presets/interaction/blender.py
trunk/blender/release/scripts/presets/interaction/maya.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/templates/operator_modal.py
trunk/blender/release/scripts/templates/operator_modal_draw.py
trunk/blender/release/scripts/templates/operator_modal_view3d.py
trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_userpref_keymap.py
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_context.c
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
Modified: trunk/blender/release/scripts/modules/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/io_utils.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/modules/io_utils.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -28,9 +28,9 @@
def invoke(self, context, event):
import os
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'}
@@ -38,8 +38,7 @@
filepath = StringProperty(name="File Path", description="Filepath used for importing the file", maxlen= 1024, default= "", subtype='FILE_PATH')
def invoke(self, context, event):
- wm = context.manager
- wm.add_fileselect(self)
+ context.window_manager.add_fileselect(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/op/console_python.py
===================================================================
--- trunk/blender/release/scripts/op/console_python.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/op/console_python.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -44,7 +44,7 @@
from code import InteractiveConsole
consoles = getattr(get_console, "consoles", None)
- hash_next = hash(bpy.context.manager)
+ hash_next = hash(bpy.context.window_manager)
if consoles is None:
consoles = get_console.consoles = {}
Modified: trunk/blender/release/scripts/op/nla.py
===================================================================
--- trunk/blender/release/scripts/op/nla.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/op/nla.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -169,7 +169,7 @@
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
return wm.invoke_props_dialog(self)
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/op/object.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -59,7 +59,7 @@
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
# return wm.invoke_props_popup(self, event)
wm.invoke_props_popup(self, event)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/op/presets.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -64,7 +64,7 @@
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
#crashes, TODO - fix
#return wm.invoke_props_popup(self, event)
Modified: trunk/blender/release/scripts/op/uv.py
===================================================================
--- trunk/blender/release/scripts/op/uv.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/op/uv.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -207,7 +207,7 @@
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/op/wm.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -449,7 +449,7 @@
else:
self.properties.initial_x = event.mouse_x
- context.manager.add_modal_handler(self)
+ context.window_manager.add_modal_handler(self)
return {'RUNNING_MODAL'}
@@ -608,7 +608,7 @@
layout.prop(props, "doc_new", text="")
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
return wm.invoke_props_dialog(self, width=600)
@@ -692,7 +692,7 @@
self.properties.max = prop_ui.get("max", 1000000000)
self.properties.description = prop_ui.get("description", "")
- wm = context.manager
+ wm = context.window_manager
# This crashes, TODO - fix
#return wm.invoke_props_popup(self, event)
Modified: trunk/blender/release/scripts/presets/interaction/blender.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/blender.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/presets/interaction/blender.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -1,7 +1,7 @@
# Configuration Blender
import bpy
-wm = bpy.context.manager
+wm = bpy.context.window_manager
wm.keyconfigs.active = wm.keyconfigs['Blender']
bpy.context.user_preferences.view.use_mouse_auto_depth = False
Modified: trunk/blender/release/scripts/presets/interaction/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/maya.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/presets/interaction/maya.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -1,7 +1,7 @@
# Configuration Maya
import bpy
-wm = bpy.context.manager
+wm = bpy.context.window_manager
kc = wm.keyconfigs.new('Maya')
# Map 3D View
Modified: trunk/blender/release/scripts/templates/operator.py
===================================================================
--- trunk/blender/release/scripts/templates/operator.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/templates/operator.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -38,7 +38,7 @@
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
if True:
# File selector
Modified: trunk/blender/release/scripts/templates/operator_modal.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/templates/operator_modal.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -25,7 +25,7 @@
def invoke(self, context, event):
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_value = context.object.location.x
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/templates/operator_modal_draw.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal_draw.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/templates/operator_modal_draw.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -52,7 +52,7 @@
def invoke(self, context, event):
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
# draw in view space with 'POST_VIEW' and 'PRE_VIEW'
Modified: trunk/blender/release/scripts/templates/operator_modal_view3d.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal_view3d.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/templates/operator_modal_view3d.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -39,7 +39,7 @@
v3d = context.space_data
rv3d = v3d.region_3d
- context.manager.add_modal_handler(self)
+ context.window_manager.add_modal_handler(self)
if rv3d.view_perspective == 'CAMERA':
rv3d.view_perspective = 'PERSP'
Modified: trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -250,7 +250,7 @@
import os
obj = context.object
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)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_scene.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/ui/properties_scene.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -314,7 +314,7 @@
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2010-09-02 00:24:33 UTC (rev 31712)
+++ trunk/blender/release/scripts/ui/space_info.py 2010-09-02 04:53:05 UTC (rev 31713)
@@ -26,7 +26,7 @@
def draw(self, context):
layout = self.layout
- wm = context.manager
+ wm = context.window_manager
window = context.window
scene = context.scene
rd = scene.render
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list