cleanup

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))
 

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

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

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})

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):