cleanup
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Feb 2015 05:09:24 +0000 (16:09 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Feb 2015 05:17:00 +0000 (16:17 +1100)
build_files/cmake/cmake_consistency_check.py
release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
release/scripts/modules/bpy_extras/keyconfig_utils.py
release/scripts/startup/bl_operators/clip.py
release/scripts/startup/bl_ui/space_filebrowser.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/python/generic/CMakeLists.txt
tests/python/batch_import.py

index 3de27ffb1e426bc80a74fb116c587014076d9aca..4b2203165489969b5fc13c1b6944d472907b23a6 100755 (executable)
@@ -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))
 
index d434c6a79cdaed2454440e0da8bf008c53d164f6..c3b2ae9908b074b54d13755187793cbfc01551d7 100644 (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
index abc613bfa142632681612ff75074eacc26687225..7e4c9e885e71a24b63918c64dd8febd8424a5120 100644 (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', []),
         ]),
 
index 99819166adccd36456aa4ae79631d2e823b001d5..5ce09b30d1f3249bd98f40e672529611eb37feb0 100644 (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
index ded307e868040fd15b2619077cb0a12ad67786f9..bdd8a107197233f80bad4c71f8955676f531e4bc 100644 (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
index 834973a9a36650708ddd971c7a692032f7c9fb8a..0be1bf0b90ad2741e9fcf241566c9f37c1be918a 100644 (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")
 
 
index b5bd13781f7dc90c362c41f03cf2841f54345df4..845e568d1061d5ccca8454a81564a0e7a751751d 100644 (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):
index c0baeafe5fcf871e88792c06fe8850191e723b9e..3646d214bde4e980cb7592b1763e8bc9938832bb 100644 (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)
index 155247a42492ee77b0ee5bf3252dca80727ef379..df611e00d00b09a1cad0a3ae7f4c417a0d36d062 100644 (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})
index dea08b45c3a62662bd90bfeed222bca91547b7a8..8fc679a7c154deccd2ef61797f021da15dc90f09 100644 (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):