bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

code cleanup: pep8 & minor changes

Browse Source
This commit is contained in:
Campbell Barton 2013-03-11 02:19:58 +00:00
parent 81aa46efaa
commit 34f3dc43e7
10 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/modules/console/complete_import.py
View File

@ -113,8 +113,8 @@ def module_list(path):
#folder_list = glob.glob(os.path.join(path,'*')) #folder_list = glob.glob(os.path.join(path,'*'))
folder_list = [p for p in folder_list \ folder_list = [p for p in folder_list \
if os.path.exists(os.path.join(path, p, '__init__.py')) \ if os.path.exists(os.path.join(path, p, '__init__.py')) \
or p[-3:] in ('.py', '.so')\ or p[-3:] in {'.py', '.so'} \
or p[-4:] in ('.pyc', '.pyo', '.pyd')] or p[-4:] in {'.pyc', '.pyo', '.pyd'}]
folder_list = [os.path.basename(p).split('.')[0] for p in folder_list] folder_list = [os.path.basename(p).split('.')[0] for p in folder_list]
return folder_list return folder_list

1
release/scripts/presets/keyconfig/3dsmax.py
View File

@ -1357,4 +1357,3 @@ kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_UP', 'PAGE_UP', 'PRESS', shift
kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_DOWN', 'PAGE_DOWN', 'PRESS', shift=True) kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_DOWN', 'PAGE_DOWN', 'PRESS', shift=True)
kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_UP', 'WHEELDOWNMOUSE', 'PRESS', shift=True) kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_UP', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_DOWN', 'WHEELUPMOUSE', 'PRESS', shift=True) kmi = km.keymap_items.new_modal('AUTOIK_CHAIN_LEN_DOWN', 'WHEELUPMOUSE', 'PRESS', shift=True)

6
release/scripts/startup/bl_ui/properties_constraint.py
View File

@ -851,16 +851,16 @@ class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
ob = context.object obj = context.object
if ob.type == 'ARMATURE' and ob.mode in ('EDIT', 'POSE'): if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}:
box = layout.box() box = layout.box()
box.alert = True box.alert = True
box.label(icon='INFO', text="See Bone Constraints tab to Add Constraints to active bone") box.label(icon='INFO', text="See Bone Constraints tab to Add Constraints to active bone")
else: else:
layout.operator_menu_enum("object.constraint_add", "type", text="Add Object Constraint") layout.operator_menu_enum("object.constraint_add", "type", text="Add Object Constraint")
for con in ob.constraints: for con in obj.constraints:
self.draw_constraint(context, con) self.draw_constraint(context, con)

2
release/scripts/startup/bl_ui/space_userpref_keymap.py
View File

@ -215,13 +215,13 @@ class InputKeyMapPanel:
_EVENT_TYPES = set() _EVENT_TYPES = set()
_EVENT_TYPE_MAP = {} _EVENT_TYPE_MAP = {}
def draw_filtered(self, display_keymaps, filter_type, filter_text, layout): def draw_filtered(self, display_keymaps, filter_type, filter_text, layout):
if filter_type == 'NAME': if filter_type == 'NAME':
def filter_func(kmi): def filter_func(kmi):
return (filter_text in kmi.idname.lower() or return (filter_text in kmi.idname.lower() or
filter_text in kmi.name.lower()) filter_text in kmi.name.lower())
else: else:
if not self._EVENT_TYPES: if not self._EVENT_TYPES:
enum = bpy.types.Event.bl_rna.properties["type"].enum_items enum = bpy.types.Event.bl_rna.properties["type"].enum_items

4
source/blender/editors/space_view3d/view3d_ruler.c
View File

@ -715,14 +715,12 @@ static void view3d_ruler_header_update(ScrArea *sa)
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Operator callbacks */ /* Operator callbacks */
static int view3d_ruler_invoke(bContext *C, wmOperator *op, wmEvent *event) static int view3d_ruler_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{ {
wmWindow *win = CTX_wm_window(C); wmWindow *win = CTX_wm_window(C);
ScrArea *sa = CTX_wm_area(C); ScrArea *sa = CTX_wm_area(C);
ARegion *ar = CTX_wm_region(C); ARegion *ar = CTX_wm_region(C);
// RegionView3D *rv3d = CTX_wm_region_view3d(C);
RulerInfo *ruler_info; RulerInfo *ruler_info;
(void)event;
ruler_info = MEM_callocN(sizeof(RulerInfo), "RulerInfo"); ruler_info = MEM_callocN(sizeof(RulerInfo), "RulerInfo");