[Bf-blender-cvs] [616eb68] master: cleanup
Campbell Barton
noreply at git.blender.org
Fri Feb 13 06:17:13 CET 2015
Commit: 616eb6818fdcf074eae31daa47c2ed581638b672
Author: Campbell Barton
Date: Fri Feb 13 16:09:24 2015 +1100
Branches: master
https://developer.blender.org/rB616eb6818fdcf074eae31daa47c2ed581638b672
cleanup
===================================================================
M build_files/cmake/cmake_consistency_check.py
M release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
M release/scripts/modules/bpy_extras/keyconfig_utils.py
M release/scripts/startup/bl_operators/clip.py
M release/scripts/startup/bl_ui/space_filebrowser.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/python/generic/CMakeLists.txt
M tests/python/batch_import.py
===================================================================
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py
index 3de27ff..4b22031 100755
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -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))
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index d434c6a..c3b2ae9 100644
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -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
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index abc613b..7e4c9e8 100644
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -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', []),
]),
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index 9981916..5ce09b3 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -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
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index ded307e..bdd8a10 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -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
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 834973a..0be1bf0 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -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")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b5bd137..845e568 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -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):
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index c0baeaf..3646d21 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -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)
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 155247a..df611e0 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -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})
diff --git a/tests/python/batch_import.py b/tests/python/batch_import.py
index dea08b4..8fc679a 100644
--- a/tests/python/batch_import.py
+++ b/tests/python/batch_import.py
@@ -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):
More information about the Bf-blender-cvs
mailing list