diff --git a/io_anim_camera.py b/io_anim_camera.py
index b0ee4cbc695cdf3722f00ec3daa2535df6e84bb0..64c79d20a7dbfa4ec76e2d03d6b03f39e9fb6374 100644
--- a/io_anim_camera.py
+++ b/io_anim_camera.py
@@ -141,7 +141,7 @@ class CameraExporter(bpy.types.Operator):
self.properties.frame_start = context.scene.frame_start
self.properties.frame_end = context.scene.frame_end
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_export_directx_x.py b/io_export_directx_x.py
index aa287e0eb3a9051484393f976f70e02b5978ea36..a4773dea487d0c72b1efad1b23aef81ab8e91a9d 100644
--- a/io_export_directx_x.py
+++ b/io_export_directx_x.py
@@ -1132,7 +1132,7 @@ class DirectXExporter(bpy.types.Operator):
return {"FINISHED"}
def invoke(self, context, event):
- WindowManager = context.manager
+ WindowManager = context.window_manager
WindowManager.add_fileselect(self)
return {"RUNNING_MODAL"}
diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index d39f24127c5543dd8576a96c50dfb9921e86d0bf..819faa80b9e022a4cb25b4ef8d6dca243b06babe 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -1501,7 +1501,7 @@ class ExportUDKAnimData(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py
index 0a7b4a84af865cadd21264059e30f2a05fc13041..fedd89da2a658c7d0c8e8c47fc5810c1c637d215 100644
--- a/io_import_images_as_planes.py
+++ b/io_import_images_as_planes.py
@@ -498,7 +498,7 @@ class ImportImagesAsPlanes(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = bpy.context.manager
+ wm = bpy.context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_import_scene_mhx.py b/io_import_scene_mhx.py
index 9f375a18327708d7374c25caecedd746bc92eaac..9230f9c7213876ada448c0c3868291821ffa608c 100644
--- a/io_import_scene_mhx.py
+++ b/io_import_scene_mhx.py
@@ -2139,7 +2139,7 @@ class IMPORT_OT_makehuman_mhx(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_import_scene_unreal_psk.py b/io_import_scene_unreal_psk.py
index f2844f2c9a694ab8926ec82a0c7b6ce076560826..5060156aff2415ccaad3c00a40a79fe1b50f3b01 100644
--- a/io_import_scene_unreal_psk.py
+++ b/io_import_scene_unreal_psk.py
@@ -580,7 +580,7 @@ class IMPORT_OT_psk(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_mesh_raw/export_raw.py b/io_mesh_raw/export_raw.py
index ac5933f6f14c25e3f56f02c13f57ffae0199d52b..59f06f9d8254582d37fe8e2d3d6417152c3d746f 100644
--- a/io_mesh_raw/export_raw.py
+++ b/io_mesh_raw/export_raw.py
@@ -105,7 +105,7 @@ class RawExporter(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_mesh_raw/import_raw.py b/io_mesh_raw/import_raw.py
index 850f7002eae8bbf05a0e0a8badfd055abdd8517c..81077e34b6b0c87666c7a16bf3b91f41e03fe3cc 100644
--- a/io_mesh_raw/import_raw.py
+++ b/io_mesh_raw/import_raw.py
@@ -136,7 +136,7 @@ class RawImporter(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index 3c2669d9cbbe48504cb3191ad92cd371ad4edcb3..96e8fc32c576b0a8a86ba408a44fb3dd0f14ea6a 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -91,7 +91,7 @@ class StlImporter(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
@@ -133,7 +133,7 @@ class StlExporter(bpy.types.Operator):
return {'FINISHED'}
def invoke(self, context, event):
- wm = context.manager
+ wm = context.window_manager
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
diff --git a/object_cloud_gen.py b/object_cloud_gen.py
index d52037058132b35d58338e642b6d6586a64c3cb3..d2336c633953103e553149ec33f463fd88cca97f 100644
--- a/object_cloud_gen.py
+++ b/object_cloud_gen.py
@@ -330,7 +330,7 @@ class GenerateCloud(bpy.types.Operator):
def execute(self, context):
# Make variable that is the current .blend file main data blocks
- main = context.main
+ blend_data = context.blend_data
# Make variable that is the active object selected by user
active_object = context.active_object
@@ -373,7 +373,7 @@ class GenerateCloud(bpy.types.Operator):
for createdObj in createdObjects:
totallyDeleteObject(scene, createdObj)
- # Delete the main object
+ # Delete the blend_data object
totallyDeleteObject(scene, mainObj)
# Select all of the left over boxes so people can immediately
@@ -404,7 +404,7 @@ class GenerateCloud(bpy.types.Operator):
bounds.hide_render = False
# Just add a Definition Property designating this
- # as the main object.
+ # as the blend_data object.
bounds["CloudMember"] = "MainObj"
# Since we used iteration 0 to copy with object we
@@ -492,7 +492,7 @@ class GenerateCloud(bpy.types.Operator):
bpy.ops.object.material_slot_remove()
# Add a new material.
- cloudMaterial = main.materials.new("CloudMaterial")
+ cloudMaterial = blend_data.materials.new("CloudMaterial")
bpy.ops.object.material_slot_add()
bounds.material_slots[0].material = cloudMaterial
@@ -510,7 +510,7 @@ class GenerateCloud(bpy.types.Operator):
# Add a texture
vMaterialTextureSlots = cloudMaterial.texture_slots
- cloudtex = main.textures.new("CloudTex", type='CLOUDS')
+ cloudtex = blend_data.textures.new("CloudTex", type='CLOUDS')
cloudtex.noise_type = 'HARD_NOISE'
cloudtex.noise_scale = 2
cloudMaterial.add_texture(cloudtex, 'ORCO')
@@ -530,7 +530,7 @@ class GenerateCloud(bpy.types.Operator):
#bpy.ops.ptcache.bake(bake=False)
# Add a Point Density texture
- pDensity = main.textures.new("CloudPointDensity", 'POINT_DENSITY')
+ pDensity = blend_data.textures.new("CloudPointDensity", 'POINT_DENSITY')
cloudMaterial.add_texture(pDensity, 'ORCO')
vMaterialTextureSlots[1].use_map_density = True
vMaterialTextureSlots[1].use_rgb_to_intensity = True
diff --git a/space_view3d_materials_utils.py b/space_view3d_materials_utils.py
index ba5b681897dd949f8ee24afe9da1b2fb964115e7..c013e4c645043d5f945ce2c43d2c757e6a1db0c9 100644
--- a/space_view3d_materials_utils.py
+++ b/space_view3d_materials_utils.py
@@ -670,12 +670,12 @@ class VIEW3D_MT_select_material(bpy.types.Menu):
def register():
- km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
+ km = bpy.context.window_manager.keyconfigs.active.keymaps['3D View']
kmi = km.items.new('wm.call_menu', 'Q', 'PRESS')
kmi.properties.name = "VIEW3D_MT_master_material"
def unregister():
- km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
+ km = bpy.context.window_manager.keyconfigs.active.keymaps['3D View']
for kmi in km.items:
if kmi.idname == 'wm.call_menu':
if kmi.properties.name == "VIEW3D_MT_master_material":
diff --git a/space_view3d_panel_measure.py b/space_view3d_panel_measure.py
index 9451bbf51ff6bd738ddfc9fd4f1b1fe4ce59c4ad..030033d86afd8a42e4bb3dde0c13ba8cb12a90d0 100644
--- a/space_view3d_panel_measure.py
+++ b/space_view3d_panel_measure.py
@@ -606,12 +606,12 @@ class VIEW3D_OT_display_measurements(bpy.types.Operator):
def execute(self, context):
if context.area.type == 'VIEW_3D':
- mgr_ops = context.manager.operators.values()
+ mgr_ops = context.window_manager.operators.values()
if not self.bl_idname in [op.bl_idname for op in mgr_ops]:
# Add the region OpenGL drawing callback
for WINregion in context.area.regions:
if WINregion.type == 'WINDOW':
- context.manager.add_modal_handler(self)
+ context.window_manager.add_modal_handler(self)
self._handle = WINregion.callback_add(
draw_measurements_callback,
(self, context),
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index f41e51d8a932646ec7352302d9f2b24308029492..08ca119867e39d073c185e51d25f30007e873932 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -1454,13 +1454,13 @@ class VIEW3D_MT_undoS(bpy.types.Menu):
layout.operator("ed.redo", icon='TRIA_RIGHT')
def register():
- km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
+ km = bpy.context.window_manager.keyconfigs.active.keymaps['3D View']
kmi = km.items.new('wm.call_menu', 'SPACE', 'PRESS')
kmi.properties.name = "VIEW3D_MT_Space_Dynamic_Menu"
def unregister():
- km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
+ km = bpy.context.window_manager.keyconfigs.active.keymaps['3D View']
for kmi in km.items:
if kmi.idname == 'wm.call_menu':
if kmi.properties.name == "VIEW3D_MT_Space_Dynamic_Menu":