tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

cleanup

This commit is contained in:
Campbell Barton 2015-02-13 16:09:24 +11:00
parent 1ae2098a6e
commit 616eb6818f
10 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/cmake_consistency_check.py
View File

@ -187,6 +187,8 @@ def cmake_get_src(f):
pass
elif new_file.endswith(".osl"): # open shading language
pass
elif new_file.endswith(".glsl"):
pass
else:
raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))

6
release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
View File

@ -258,7 +258,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False):
bpy.types.Panel.__subclasses__() +
bpy.types.Menu.__subclasses__() +
bpy.types.UIList.__subclasses__()
if cls.__name__ not in _rna_clss_ids}
if cls.__name__ not in _rna_clss_ids}
# Collect internal operators
# extend with all internal operators
@ -266,8 +266,8 @@ def dump_rna_messages(msgs, reports, settings, verbose=False):
# XXX Do not skip INTERNAL's anymore, some of those ops show up in UI now!
# all possible operator names
#op_ids = (set(cls.bl_rna.identifier for cls in bpy.types.OperatorProperties.__subclasses__()) |
#set(cls.bl_rna.identifier for cls in bpy.types.Operator.__subclasses__()) |
#set(cls.bl_rna.identifier for cls in bpy.types.OperatorMacro.__subclasses__()))
# set(cls.bl_rna.identifier for cls in bpy.types.Operator.__subclasses__()) |
# set(cls.bl_rna.identifier for cls in bpy.types.OperatorMacro.__subclasses__()))
#get_instance = __import__("_bpy").ops.get_instance
#path_resolve = type(bpy.context).__base__.path_resolve

2
release/scripts/modules/bpy_extras/keyconfig_utils.py
View File

@ -33,7 +33,7 @@ KM_HIERARCHY = [
('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation
('Header', 'EMPTY', 'WINDOW', []), # header stuff (per region)
('Grease Pencil', 'EMPTY', 'WINDOW', [ # grease pencil stuff (per region)
('Grease Pencil', 'EMPTY', 'WINDOW', [ # grease pencil stuff (per region)
('Grease Pencil Stroke Edit Mode', 'EMPTY', 'WINDOW', []),
]),

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

@ -162,8 +162,8 @@ class CLIP_OT_filter_tracks(bpy.types.Operator):
# Find tracks with markers in both this frame and the previous one.
relevant_tracks = [
track for track in clip.tracking.tracks
if track.markers.find_frame(frame) and
track.markers.find_frame(frame - 1)]
if (track.markers.find_frame(frame) and
track.markers.find_frame(frame - 1))]
if not relevant_tracks:
continue

1
release/scripts/startup/bl_ui/space_filebrowser.py
View File

@ -81,7 +81,6 @@ class FILEBROWSER_HT_header(Header):
row.prop(params, "filter_search", text="", icon='VIEWZOOM')
class FILEBROWSER_UL_dir(bpy.types.UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
direntry = item

14
release/scripts/startup/bl_ui/space_sequencer.py
View File

@ -928,19 +928,19 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
enabled = ""
row = layout.row()
if (strip.proxy.build_25):
enabled += "25% "
enabled += "25% "
if (strip.proxy.build_50):
enabled += "50% "
enabled += "50% "
if (strip.proxy.build_75):
enabled += "75% "
enabled += "75% "
if (strip.proxy.build_100):
enabled += "100% "
enabled += "100% "
row.label(enabled)
if (strip.proxy.use_overwrite):
layout.label("Overwrite On")
layout.label("Overwrite On")
else:
layout.label("Overwrite Off")
layout.label("Overwrite Off")
col = layout.column()
col.label(text="Build JPEG quality")
@ -953,7 +953,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
col.prop(strip.proxy, "timecode")
col = layout.column()
col.operator("sequencer.enable_proxies")
col.operator("sequencer.enable_proxies")
col.operator("sequencer.rebuild_proxy")

4
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3206,8 +3206,8 @@ class VIEW3D_PT_background_image(Panel):
row = box.row()
if bg.view_axis != 'CAMERA':
row.prop(bg, "rotation")
row.prop(bg, "size")
row.prop(bg, "rotation")
row.prop(bg, "size")
class VIEW3D_PT_transform_orientations(Panel):

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

@ -1724,7 +1724,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPaintPanel, Panel):
layout.prop(ipaint, "use_cavity")
if ipaint.use_cavity:
layout.template_curve_mapping(ipaint, "cavity_curve", brush=True)
layout.prop(ipaint, "seam_bleed")
layout.prop(ipaint, "dither")
self.unified_paint_settings(layout, context)

3
source/blender/python/generic/CMakeLists.txt
View File

@ -46,6 +46,9 @@ set(SRC
bpy_internal_import.h
idprop_py_api.h
py_capi_utils.h
# header-only
python_utildefines.h
)
add_definitions(${GL_DEFINITIONS})

4
tests/python/batch_import.py
View File

@ -78,7 +78,9 @@ def batch_import(operator="",
path = os.path.abspath(path)
match_upper = match.upper()
pattern_match = lambda a: fnmatch.fnmatchcase(a.upper(), match_upper)
def pattern_match(a):
return fnmatch.fnmatchcase(a.upper(), match_upper)
def file_generator(path):
for dirpath, dirnames, filenames in os.walk(path):