kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Python context access

Browse Source 
Avoid access from bpy when it's already declared.
This commit is contained in:
Campbell Barton 2018-02-07 15:47:54 +11:00
parent 1e4b612d6a
commit 6981861fcf
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_operators/freestyle.py
View File

@ -78,10 +78,10 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator):
self.report({'ERROR'}, "Unexpected modifier type: " + m.type) self.report({'ERROR'}, "Unexpected modifier type: " + m.type)
return {'CANCELLED'} return {'CANCELLED'}
# Find selected vertices in editmesh # Find selected vertices in editmesh
ob = bpy.context.active_object ob = context.active_object
if ob.type == 'MESH' and ob.mode == 'EDIT' and ob.name != ref.name: if ob.type == 'MESH' and ob.mode == 'EDIT' and ob.name != ref.name:
bpy.ops.object.mode_set(mode='OBJECT') bpy.ops.object.mode_set(mode='OBJECT')
selected_verts = [v for v in bpy.context.active_object.data.vertices if v.select] selected_verts = [v for v in ob.data.vertices if v.select]
bpy.ops.object.mode_set(mode='EDIT') bpy.ops.object.mode_set(mode='EDIT')
# Compute the min/max distance from the reference to mesh vertices # Compute the min/max distance from the reference to mesh vertices
min_dist = sys.float_info.max min_dist = sys.float_info.max

8
release/scripts/startup/bl_operators/object_align.py
View File

@ -66,13 +66,13 @@ def GlobalBB_LQ(bb_world):
return (Vector((left, front, up)), Vector((right, back, down))) return (Vector((left, front, up)), Vector((right, back, down)))
def GlobalBB_HQ(obj): def GlobalBB_HQ(scene, obj):
matrix_world = obj.matrix_world.copy() matrix_world = obj.matrix_world.copy()
# Initialize the variables with the last vertex # Initialize the variables with the last vertex
me = obj.to_mesh(scene=bpy.context.scene, apply_modifiers=True, settings='PREVIEW') me = obj.to_mesh(scene=scene, apply_modifiers=True, settings='PREVIEW')
verts = me.vertices verts = me.vertices
val = matrix_world * verts[-1].co val = matrix_world * verts[-1].co
@ -155,7 +155,7 @@ def align_objects(context,
for obj, bb_world in objects: for obj, bb_world in objects:
if bb_quality and obj.type == 'MESH': if bb_quality and obj.type == 'MESH':
GBB = GlobalBB_HQ(obj) GBB = GlobalBB_HQ(scene, obj)
else: else:
GBB = GlobalBB_LQ(bb_world) GBB = GlobalBB_LQ(bb_world)
@ -219,7 +219,7 @@ def align_objects(context,
bb_world = [matrix_world * Vector(v[:]) for v in obj.bound_box] bb_world = [matrix_world * Vector(v[:]) for v in obj.bound_box]
if bb_quality and obj.type == 'MESH': if bb_quality and obj.type == 'MESH':
GBB = GlobalBB_HQ(obj) GBB = GlobalBB_HQ(scene, obj)
else: else:
GBB = GlobalBB_LQ(bb_world) GBB = GlobalBB_LQ(bb_world)

2
release/scripts/startup/bl_operators/wm.py
View File

@ -2223,7 +2223,7 @@ class WM_OT_addon_userpref_show(Operator):
info = addon_utils.module_bl_info(mod) info = addon_utils.module_bl_info(mod)
info["show_expanded"] = True info["show_expanded"] = True
bpy.context.user_preferences.active_section = 'ADDONS' context.user_preferences.active_section = 'ADDONS'
context.window_manager.addon_filter = 'All' context.window_manager.addon_filter = 'All'
context.window_manager.addon_search = info["name"] context.window_manager.addon_search = info["name"]
bpy.ops.screen.userpref_show('INVOKE_DEFAULT') bpy.ops.screen.userpref_show('INVOKE_DEFAULT')

3
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -938,12 +938,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "material_offset_rim", text="Rim") row.prop(md, "material_offset_rim", text="Rim")
def SUBSURF(self, layout, ob, md): def SUBSURF(self, layout, ob, md):
from bpy import context
layout.row().prop(md, "subdivision_type", expand=True) layout.row().prop(md, "subdivision_type", expand=True)
split = layout.split() split = layout.split()
col = split.column() col = split.column()
scene = bpy.context.scene scene = context.scene
engine = scene.render.engine engine = scene.render.engine
show_adaptive_options = ( show_adaptive_options = (
engine == 'CYCLES' and md == ob.modifiers[-1] and engine == 'CYCLES' and md == ob.modifiers[-1] and

5
release/scripts/startup/bl_ui/space_time.py
View File

@ -119,7 +119,7 @@ class TIME_MT_marker(Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
marker_menu_generic(layout) marker_menu_generic(layout, context)
class TIME_MT_view(Menu): class TIME_MT_view(Menu):
@ -239,6 +239,7 @@ class TIME_MT_autokey(Menu):
def marker_menu_generic(layout): def marker_menu_generic(layout):
from bpy import context
# layout.operator_context = 'EXEC_REGION_WIN' # layout.operator_context = 'EXEC_REGION_WIN'
@ -265,7 +266,7 @@ def marker_menu_generic(layout):
layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False layout.operator("screen.marker_jump", text="Jump to Previous Marker").next = False
layout.separator() layout.separator()
ts = bpy.context.tool_settings ts = context.tool_settings
layout.prop(ts, "lock_markers") layout.prop(ts, "lock_markers")