cmake & pep8 tidy up, also some style edits.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 01:32:34 +0000 (01:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 Nov 2011 01:32:34 +0000 (01:32 +0000)
remove unneeded collection length function.

26 files changed:
doc/python_api/examples/bpy.app.handlers.1.py
doc/python_api/examples/bpy.app.handlers.py
extern/libmv/CMakeLists.txt
release/scripts/modules/bpy/ops.py
release/scripts/modules/bpyml_ui.py
release/scripts/startup/bl_operators/clip.py
release/scripts/startup/bl_operators/object_quick_effects.py
release/scripts/startup/bl_operators/uvcalc_smart_project.py
release/scripts/startup/bl_ui/properties_data_camera.py
release/scripts/startup/bl_ui/properties_data_lamp.py
release/scripts/startup/bl_ui/properties_game.py
release/scripts/startup/bl_ui/properties_material.py
release/scripts/startup/bl_ui/properties_object.py
release/scripts/startup/bl_ui/properties_physics_cloth.py
release/scripts/startup/bl_ui/properties_physics_fluid.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/movieclip.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_tracking.c

index a6591f6b83f6da6ca15bc0fabdeb2d26b56b7d08..48fdb95d7932d7e01d15c0d80ddde171d94d7ae9 100644 (file)
@@ -15,6 +15,6 @@ from bpy.app.handlers import persistent
 
 @persistent
 def load_handler(dummy):
-   print("Load Handler:", bpy.data.filepath)
+    print("Load Handler:", bpy.data.filepath)
 
 bpy.app.handlers.load_post.append(load_handler)
index 02b00bf2fbc1c72fef0026c2ac039ce781dc9b5d..57b209e15f02f6685e188dfebb3c5f4571d5135c 100644 (file)
@@ -6,7 +6,8 @@ This script shows the most simple example of adding a handler.
 
 import bpy
 
+
 def my_handler(scene):
-   print("Frame Change", scene.frame_current)
+    print("Frame Change", scene.frame_current)
 
 bpy.app.handlers.frame_change_pre.append(my_handler)
index 7ab01598cefe6ded43c59d8c52990cd99b1da359..333791e28eb9ca541b4145a67566de5ed42a731f 100644 (file)
@@ -25,8 +25,8 @@
 set(INC
        .
        ../Eigen3
-       ./third_party/ssba
-       ./third_party/ldl/Include
+       third_party/ssba
+       third_party/ldl/Include
        ../colamd/Include
 )
 
@@ -130,7 +130,7 @@ set(SRC
        third_party/msinttypes/inttypes.h
 )
 
-IF(WIN32)
+if(WIN32)
        list(APPEND SRC
                third_party/glog/src/logging.cc
                third_party/glog/src/raw_logging.cc
@@ -158,23 +158,23 @@ IF(WIN32)
        )
 
        list(APPEND INC
-               ./third_party/glog/src/windows
+               third_party/glog/src/windows
        )
 
-       IF(NOT MINGW)
+       if(NOT MINGW)
                list(APPEND INC
-                       ./third_party/msinttypes
+                       third_party/msinttypes
                )
-       ENDIF(NOT MINGW)
+       endif()
 
-       IF(MSVC)
+       if(MSVC)
                set(MSVC_OFLAGS O1 O2 Ox)
                foreach(FLAG )
                        string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
                        string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
                endforeach()
-       ENDIF(MSVC)
-ELSE(WIN32)
+       endif()
+else(WIN32)
        list(APPEND SRC
                third_party/glog/src/utilities.cc
                third_party/glog/src/symbolize.cc
@@ -206,9 +206,9 @@ ELSE(WIN32)
        )
 
        list(APPEND INC
-               ./third_party/glog/src
+               third_party/glog/src
        )
-ENDIF(WIN32)
+endif()
 
 add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
 
index 382a47cb4e6f7d773d4037666dbdecaeb75f8ff7..d01b706cc37ae9a0d0e8c5c883a64c4b3393617b 100644 (file)
@@ -208,7 +208,7 @@ class BPyOpsSubModOp(object):
         return "# %s\n%s" % (descr, as_string)
 
     def __str__(self):  # used for print(...)
-        return "<function bpy.ops.%s.%s at 0x%x'>" % \
-                (self.module, self.func, id(self))
+        return ("<function bpy.ops.%s.%s at 0x%x'>" %
+                (self.module, self.func, id(self)))
 
 ops_fake_module = BPyOps()
index f4b6de23dbb2cf93ce9b68fe8137bfc7fa3e2ff4..4828b3649d3a4b443415fbe536bf0abe227712f6 100644 (file)
@@ -25,9 +25,11 @@ from bpyml import TAG, ARGS, CHILDREN
 
 _uilayout_rna = _bpy.types.UILayout.bl_rna
 
-_uilayout_tags = ["ui"] + \
-    _uilayout_rna.properties.keys() + \
+_uilayout_tags = (
+    ["ui"] +
+    _uilayout_rna.properties.keys() +
     _uilayout_rna.functions.keys()
+    )
 
 # these need to be imported directly
 # >>> from bpyml_ui.locals import *
index d085b7ea1055fa8454ec52b9707a025bae372917..5559262111219f32c5cff496d1801755d0dcc96e 100644 (file)
@@ -155,7 +155,8 @@ class CLIP_OT_delete_proxy(Operator):
             self._rmproxy(d + '_undistorted')
             self._rmproxy(os.path.join(absproxy, 'proxy_' + str(x) + '.avi'))
 
-        tc = ('free_run.blen_tc', 'interp_free_run.blen_tc', \
+        tc = ('free_run.blen_tc',
+              'interp_free_run.blen_tc',
               'record_run.blen_tc')
 
         for x in tc:
@@ -280,10 +281,10 @@ class CLIP_OT_constraint_to_fcurve(Operator):
                 efra = max(efra, track.markers[-1].frame)
 
         if sfra is None or efra is None:
-           return
+            return
 
         # Store object matrices
-        for x in range(sfra, efra+1):
+        for x in range(sfra, efra + 1):
             scene.frame_set(x)
             matrices.append(ob.matrix_world.copy())
 
@@ -291,7 +292,7 @@ class CLIP_OT_constraint_to_fcurve(Operator):
 
         # Apply matrices on object and insert keyframes
         i = 0
-        for x in range(sfra, efra+1):
+        for x in range(sfra, efra + 1):
             scene.frame_set(x)
             ob.matrix_world = matrices[i]
 
index 490ee23022017d4082e5a726e08bfa149a466f91..a062ac6f4c523558c236730af1b577cf3ca43f09 100644 (file)
@@ -105,8 +105,7 @@ class QuickFur(Operator):
             psys.settings.child_type = 'INTERPOLATED'
 
             obj.data.materials.append(mat)
-            obj.particle_systems[-1].settings.material = \
-                    len(obj.data.materials)
+            psys.settings.material = len(obj.data.materials)
 
         return {'FINISHED'}
 
index 66d0d72efc188a344c06cd8cd85d8b144d3c561d..17e353ff238165a01c27890277001ad7613ae129 100644 (file)
@@ -212,8 +212,11 @@ def islandIntersectUvIsland(source, target, SourceOffset):
     # Edge intersect test
     for ed in edgeLoopsSource:
         for seg in edgeLoopsTarget:
-            i = geometry.intersect_line_line_2d(\
-            seg[0], seg[1], SourceOffset+ed[0], SourceOffset+ed[1])
+            i = geometry.intersect_line_line_2d(seg[0],
+                                                seg[1],
+                                                SourceOffset+ed[0],
+                                                SourceOffset+ed[1],
+                                                )
             if i:
                 return 1 # LINE INTERSECTION
 
@@ -773,15 +776,16 @@ def main_consts():
     global ROTMAT_2D_POS_45D
     global RotMatStepRotation
 
-    ROTMAT_2D_POS_90D = Matrix.Rotation( radians(90.0), 2)
-    ROTMAT_2D_POS_45D = Matrix.Rotation( radians(45.0), 2)
+    ROTMAT_2D_POS_90D = Matrix.Rotation(radians(90.0), 2)
+    ROTMAT_2D_POS_45D = Matrix.Rotation(radians(45.0), 2)
 
     RotMatStepRotation = []
     rot_angle = 22.5 #45.0/2
     while rot_angle > 0.1:
-        RotMatStepRotation.append([\
-         Matrix.Rotation( radians(rot_angle), 2),\
-         Matrix.Rotation( radians(-rot_angle), 2)])
+        RotMatStepRotation.append([
+            Matrix.Rotation(radians(+rot_angle), 2),
+            Matrix.Rotation(radians(-rot_angle), 2),
+            ])
 
         rot_angle = rot_angle/2.0
 
index 0abbf281754e2d547e385a40647d34361786598f..1a0fb0ef4ac3efe3e3590654ad3b8de76ee0f3e7 100644 (file)
@@ -108,6 +108,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel):
         col.prop(cam, "clip_start", text="Start")
         col.prop(cam, "clip_end", text="End")
 
+
 class DATA_PT_camera(CameraButtonsPanel, Panel):
     bl_label = "Camera"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -120,8 +121,8 @@ class DATA_PT_camera(CameraButtonsPanel, Panel):
         row = layout.row(align=True)
 
         row.menu("CAMERA_MT_presets", text=bpy.types.CAMERA_MT_presets.bl_label)
-        row.operator("camera.preset_add", text="", icon="ZOOMIN")
-        row.operator("camera.preset_add", text="", icon="ZOOMOUT").remove_active = True
+        row.operator("camera.preset_add", text="", icon='ZOOMIN')
+        row.operator("camera.preset_add", text="", icon='ZOOMOUT').remove_active = True
 
         layout.label(text="Sensor:")
 
@@ -137,6 +138,7 @@ class DATA_PT_camera(CameraButtonsPanel, Panel):
         col = split.column(align=True)
         col.prop(cam, "sensor_fit", text="")
 
+
 class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
     bl_label = "Depth of Field"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -156,6 +158,7 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
         col.active = cam.dof_object is None
         col.prop(cam, "dof_distance", text="Distance")
 
+
 class DATA_PT_camera_display(CameraButtonsPanel, Panel):
     bl_label = "Display"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
index 4ff180f74fbe76f2acfd969264daa53bcf62b6d9..974924be46cbac8a12a7b49f8cfe565d18642ab0 100644 (file)
@@ -134,8 +134,8 @@ class DATA_PT_sunsky(DataButtonsPanel, Panel):
         row = layout.row(align=True)
         row.prop(lamp, "use_sky")
         row.menu("LAMP_MT_sunsky_presets", text=bpy.types.LAMP_MT_sunsky_presets.bl_label)
-        row.operator("lamp.sunsky_preset_add", text="", icon="ZOOMIN")
-        row.operator("lamp.sunsky_preset_add", text="", icon="ZOOMOUT").remove_active = True
+        row.operator("lamp.sunsky_preset_add", text="", icon='ZOOMIN')
+        row.operator("lamp.sunsky_preset_add", text="", icon='ZOOMOUT').remove_active = True
 
         row = layout.row()
         row.active = lamp.use_sky or lamp.use_atmosphere
index 0d104571e4b1c130da0750868601d133832a3ce7..ba9bb4a624d63db3d172c69e1cc73e39d8b8372c 100644 (file)
@@ -315,11 +315,9 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
 
             split = layout.split()
 
-            if dome_type == 'FISHEYE' or \
-               dome_type == 'TRUNCATED_REAR' or \
-               dome_type == 'TRUNCATED_FRONT':
-
+            if dome_type in {'FISHEYE', 'TRUNCATED_REAR', 'TRUNCATED_FRONT'}:
                 col = split.column()
+
                 col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
                 col.prop(gs, "dome_angle", slider=True)
 
@@ -336,6 +334,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
 
             else:  # cube map
                 col = split.column()
+
                 col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
 
                 col = split.column()
index 62cb735fda9535273d71883a8a0b0f0643c1a2d2..f5a95016baaa26eca56c964311c32f616e7b6315 100644 (file)
@@ -124,7 +124,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel, Panel):
             split.template_ID(ob, "active_material", new="material.new")
             row = split.row()
             if mat:
-                row.prop(mat, "use_nodes", icon="NODETREE", text="")
+                row.prop(mat, "use_nodes", icon='NODETREE', text="")
 
             if slot:
                 row.prop(slot, "link", text="")
@@ -501,8 +501,8 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, Panel):
         row = layout.row().split()
         sub = row.row(align=True).split(percentage=0.75)
         sub.menu("MATERIAL_MT_sss_presets", text=bpy.types.MATERIAL_MT_sss_presets.bl_label)
-        sub.operator("material.sss_preset_add", text="", icon="ZOOMIN")
-        sub.operator("material.sss_preset_add", text="", icon="ZOOMOUT").remove_active = True
+        sub.operator("material.sss_preset_add", text="", icon='ZOOMIN')
+        sub.operator("material.sss_preset_add", text="", icon='ZOOMOUT').remove_active = True
 
         split = layout.split()
 
index a359d58b59e1d7a9beb7defbc16a2a3f70218fc6..36b8129ad8a6692ad0577cb4d597c36aea6fa6f7 100644 (file)
@@ -267,12 +267,12 @@ class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel):
         ob = context.object
 
         split = layout.split()
-        
+
         col = split.column()
         col.label(text="Tracking Axes:")
         col.prop(ob, "track_axis", text="Axis")
         col.prop(ob, "up_axis", text="Up Axis")
-        
+
         col = split.column()
         col.prop(ob, "use_slow_parent")
         row = col.row()
index c66a05637548b37aca7c862dde24db8546a46bce..afb3c00098096c6aaad3042585f90eb4cfa64e4f 100644 (file)
@@ -73,8 +73,8 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel):
             col.label(text="Presets:")
             sub = col.row(align=True)
             sub.menu("CLOTH_MT_presets", text=bpy.types.CLOTH_MT_presets.bl_label)
-            sub.operator("cloth.preset_add", text="", icon="ZOOMIN")
-            sub.operator("cloth.preset_add", text="", icon="ZOOMOUT").remove_active = True
+            sub.operator("cloth.preset_add", text="", icon='ZOOMIN')
+            sub.operator("cloth.preset_add", text="", icon='ZOOMOUT').remove_active = True
 
             col.label(text="Quality:")
             col.prop(cloth, "quality", text="Steps", slider=True)
index efb760c0b43a39f8e174f1eba7a3803bb4870c73..ce65350e69b752bf1e0327749f4c99688aff4c6d 100644 (file)
@@ -206,7 +206,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
 
         col = split.column()
         if scene.use_gravity:
-            col.label(text="Use Scene Gravity", icon="SCENE_DATA")
+            col.label(text="Use Scene Gravity", icon='SCENE_DATA')
             sub = col.column()
             sub.enabled = False
             sub.prop(fluid, "gravity", text="")
@@ -215,7 +215,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
             col.prop(fluid, "gravity", text="")
 
         if scene.unit_settings.system != 'NONE':
-            col.label(text="Use Scene Size Units", icon="SCENE_DATA")
+            col.label(text="Use Scene Size Units", icon='SCENE_DATA')
             sub = col.column()
             sub.enabled = False
             sub.prop(fluid, "simulation_scale", text="Metres")
index 815f0a7757074ae888207ae6f956c74d4f1ec5d2..145ae292e11b512cc52085f921ac962e8d954a03 100644 (file)
@@ -186,8 +186,8 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel):
 
         row = layout.row(align=True)
         row.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
-        row.operator("render.preset_add", text="", icon="ZOOMIN")
-        row.operator("render.preset_add", text="", icon="ZOOMOUT").remove_active = True
+        row.operator("render.preset_add", text="", icon='ZOOMIN')
+        row.operator("render.preset_add", text="", icon='ZOOMOUT').remove_active = True
 
         split = layout.split()
 
index 09209017823e270ea4011361e6fad29a26a61d9d..3148c0dd51ace86167535177541adddd0851970c 100644 (file)
@@ -312,10 +312,10 @@ class CLIP_PT_track(Panel):
         row = layout.row(align=True)
         label = bpy.types.CLIP_MT_track_color_presets.bl_label
         row.menu('CLIP_MT_track_color_presets', text=label)
-        row.menu('CLIP_MT_track_color_specials', text="", icon="DOWNARROW_HLT")
-        row.operator("clip.track_color_preset_add", text="", icon="ZOOMIN")
+        row.menu('CLIP_MT_track_color_specials', text="", icon='DOWNARROW_HLT')
+        row.operator("clip.track_color_preset_add", text="", icon='ZOOMIN')
         props = row.operator("clip.track_color_preset_add",
-            text="", icon="ZOOMOUT")
+                             text="", icon='ZOOMOUT')
         props.remove_active = True
 
         row = layout.row()
@@ -349,8 +349,8 @@ class CLIP_PT_tracking_camera(Panel):
         row = layout.row(align=True)
         label = bpy.types.CLIP_MT_camera_presets.bl_label
         row.menu('CLIP_MT_camera_presets', text=label)
-        row.operator("clip.camera_preset_add", text="", icon="ZOOMIN")
-        props = row.operator("clip.camera_preset_add", text="", icon="ZOOMOUT")
+        row.operator("clip.camera_preset_add", text="", icon='ZOOMIN')
+        props = row.operator("clip.camera_preset_add", text="", icon='ZOOMOUT')
         props.remove_active = True
 
         row = layout.row(align=True)
@@ -441,11 +441,11 @@ class CLIP_PT_track_settings(Panel):
 
         active = clip.tracking.tracks.active
         if active:
-          layout.prop(active, "tracker")
-          if active.tracker == "KLT":
-              layout.prop(active, "pyramid_levels")
-          if active.tracker == "SAD":
-              layout.prop(active, "correlation_min")
+            layout.prop(active, "tracker")
+            if active.tracker == 'KLT':
+                layout.prop(active, "pyramid_levels")
+            elif active.tracker == 'SAD':
+                layout.prop(active, "correlation_min")
 
         layout.prop(settings, "frames_adjust")
         layout.prop(settings, "speed")
@@ -489,7 +489,7 @@ class CLIP_PT_stabilization(Panel):
         sub.operator("clip.stabilize_2d_remove", icon='ZOOMOUT', text="")
 
         sub.menu('CLIP_MT_stabilize_2d_specials', text="",
-            icon="DOWNARROW_HLT")
+                 icon='DOWNARROW_HLT')
 
         layout.prop(stab, "influence_location")
 
index 50db989a2e20fd6f9a0d538b7a9e52f96c8291d7..170ba3ccd0ed85b73ae136dd8fc276bab222eb5d 100644 (file)
@@ -61,7 +61,7 @@ class IMAGE_MT_view(Menu):
 
         layout.separator()
 
-        ratios = [[1, 8], [1, 4], [1, 2], [1, 1], [2, 1], [4, 1], [8, 1]]
+        ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
 
         for a, b in ratios:
             layout.operator("image.view_zoom_ratio", text="Zoom" + " %d:%d" % (a, b)).ratio = a / b
@@ -746,12 +746,12 @@ class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
         layout.template_curve_mapping(brush, "curve")
 
         row = layout.row(align=True)
-        row.operator("brush.curve_preset", icon="SMOOTHCURVE", text="").shape = 'SMOOTH'
-        row.operator("brush.curve_preset", icon="SPHERECURVE", text="").shape = 'ROUND'
-        row.operator("brush.curve_preset", icon="ROOTCURVE", text="").shape = 'ROOT'
-        row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
-        row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
-        row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
+        row.operator("brush.curve_preset", icon='SMOOTHCURVE', text="").shape = 'SMOOTH'
+        row.operator("brush.curve_preset", icon='SPHERECURVE', text="").shape = 'ROUND'
+        row.operator("brush.curve_preset", icon='ROOTCURVE', text="").shape = 'ROOT'
+        row.operator("brush.curve_preset", icon='SHARPCURVE', text="").shape = 'SHARP'
+        row.operator("brush.curve_preset", icon='LINCURVE', text="").shape = 'LINE'
+        row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX'
 
 if __name__ == "__main__":  # only for live edit.
     bpy.utils.register_module(__name__)
index c6c4a8f3335f2f9b410154c369b8e5238ab83168..a2ede26ecc628d1e499b985acd2cb0504e66654a 100644 (file)
@@ -967,10 +967,10 @@ class USERPREF_PT_addons(Panel):
                 continue
 
             # check if addon should be visible with current filters
-            if (filter == "All") or \
-                    (filter == info["category"]) or \
-                    (filter == "Enabled" and is_enabled) or \
-                    (filter == "Disabled" and not is_enabled):
+            if ((filter == "All") or
+                (filter == info["category"]) or
+                (filter == "Enabled" and is_enabled) or
+                (filter == "Disabled" and not is_enabled)):
 
                 if search and search not in info["name"].lower():
                     if info["author"]:
index 5e5ce462da9cfcbafa0cef062cc1abda58e6330b..d738e806320a5cc21b7a1dc15be3f82344bf7923 100644 (file)
@@ -223,7 +223,7 @@ class InputKeyMapPanel:
                 col = layout.column()
 
                 row = col.row()
-                row.label(text=km.name, icon="DOT")
+                row.label(text=km.name, icon='DOT')
 
                 row.label()
                 row.label()
@@ -265,13 +265,13 @@ class InputKeyMapPanel:
         if not text:
             text = "Blender (default)"
         row.menu("USERPREF_MT_keyconfigs", text=text)
-        row.operator("wm.keyconfig_preset_add", text="", icon="ZOOMIN")
-        row.operator("wm.keyconfig_preset_add", text="", icon="ZOOMOUT").remove_active = True
+        row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMIN')
+        row.operator("wm.keyconfig_preset_add", text="", icon='ZOOMOUT').remove_active = True
 
         #~ layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
         #~ row.operator("wm.keyconfig_remove", text="", icon='X')
 
-        row.prop(context.space_data, "filter_text", icon="VIEWZOOM")
+        row.prop(context.space_data, "filter_text", icon='VIEWZOOM')
 
         col.separator()
 
index 9edb1ea1197bee79d8fe93eec74611a7a99010d1..2d3be2015d76ca37aa1f0429f318e307b7a92166 100644 (file)
@@ -1536,7 +1536,7 @@ class VIEW3D_MT_edit_mesh_select_mode(Menu):
 class VIEW3D_MT_edit_mesh_extrude(Menu):
     bl_label = "Extrude"
 
-    _extrude_funcs = { \
+    _extrude_funcs = {
         "VERT": lambda layout: layout.operator("mesh.extrude_vertices_move", text="Vertices Only"),
         "EDGE": lambda layout: layout.operator("mesh.extrude_edges_move", text="Edges Only"),
         "FACE": lambda layout: layout.operator("mesh.extrude_faces_move", text="Individual Faces"),
index 332577a79026b2d44740f504d081986f8d352c74..5bcdbc1efe8f81ae2754d08b2d0d10ffe3fe2ac6 100644 (file)
@@ -172,7 +172,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
 class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
     bl_context = "mesh_edit"
     bl_label = "Mesh Options"
-    
+
     @classmethod
     def poll(cls, context):
         return context.active_object
@@ -912,12 +912,12 @@ class VIEW3D_PT_tools_brush_curve(PaintPanel, Panel):
         layout.template_curve_mapping(brush, "curve", brush=True)
 
         row = layout.row(align=True)
-        row.operator("brush.curve_preset", icon="SMOOTHCURVE", text="").shape = 'SMOOTH'
-        row.operator("brush.curve_preset", icon="SPHERECURVE", text="").shape = 'ROUND'
-        row.operator("brush.curve_preset", icon="ROOTCURVE", text="").shape = 'ROOT'
-        row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
-        row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
-        row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
+        row.operator("brush.curve_preset", icon='SMOOTHCURVE', text="").shape = 'SMOOTH'
+        row.operator("brush.curve_preset", icon='SPHERECURVE', text="").shape = 'ROUND'
+        row.operator("brush.curve_preset", icon='ROOTCURVE', text="").shape = 'ROOT'
+        row.operator("brush.curve_preset", icon='SHARPCURVE', text="").shape = 'SHARP'
+        row.operator("brush.curve_preset", icon='LINCURVE', text="").shape = 'LINE'
+        row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX'
 
 
 class VIEW3D_PT_sculpt_options(PaintPanel, Panel):
index df4e247bc93550a8e3c39023b263e6c31a9a9f96..c21806b4bc10528d9e5359feb3479b4aa65835a7 100644 (file)
@@ -370,7 +370,9 @@ if(WITH_GAMEENGINE)
 endif()
 
 if(WITH_LIBMV)
-       list(APPEND INC ../../../extern/libmv)
+       list(APPEND INC
+               ../../../extern/libmv
+       )
        add_definitions(-DWITH_LIBMV)
 endif()
 
index e3bfdd54ab128a1bcfabe15ced7030f73219f8c2..b72a3be1014139c1d68923a33358344427897fa5 100644 (file)
@@ -517,7 +517,7 @@ static ImBuf *get_undistorted_cache(MovieClip *clip, MovieClipUser *user)
        return cache->undistibuf;
 }
 
-static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *distoriton, ImBuf *ibuf)
+static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *distortion, ImBuf *ibuf)
 {
        ImBuf *undistibuf;
 
@@ -525,8 +525,8 @@ static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *dist
                otherwise, undistorted proxy can be darker than it should */
        imb_freerectfloatImBuf(ibuf);
 
-       if(distoriton)
-               undistibuf= BKE_tracking_distortion_exec(distoriton, &clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f, 1);
+       if(distortion)
+               undistibuf= BKE_tracking_distortion_exec(distortion, &clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f, 1);
        else
                undistibuf= BKE_tracking_undistort(&clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f);
 
index 7991a903bbb0e90f376eff055358d934c01479d4..8e60fe984e6ba0ba7162a088901e368c0f055a7d 100644 (file)
@@ -30,7 +30,8 @@
 
 #define MODSTACK_DEBUG 1
 
-/* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE! */
+/* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE!
+ * (ONLY ADD NEW ITEMS AT THE END) */
 
 typedef enum ModifierType {
        eModifierType_None = 0,
index f72fd3d465c731247af544a9ad3fc22bca6266ef..15ded001237a93b917fe4fa2c223dbcf23a3379c 100644 (file)
@@ -125,13 +125,6 @@ static void rna_tracking_trackerPyramid_update(Main *UNUSED(bmain), Scene *UNUSE
        BKE_tracking_clamp_track(track, CLAMP_PYRAMID_LEVELS);
 }
 
-static int rna_tracking_markers_length(PointerRNA *ptr)
-{
-       MovieTrackingTrack *track= (MovieTrackingTrack *)ptr->data;
-
-       return track->markersnr;
-}
-
 static float rna_trackingCamera_focal_mm_get(PointerRNA *ptr)
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
@@ -499,7 +492,6 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
        prop= RNA_def_property(srna, "markers", PROP_COLLECTION, PROP_NONE);
        RNA_def_property_struct_type(prop, "MovieTrackingMarker");
        RNA_def_property_collection_sdna(prop, NULL, "markers", "markersnr");
-       RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, NULL, "rna_tracking_markers_length", NULL, NULL, NULL);
        RNA_def_property_ui_text(prop, "Markers", "Collection of markers in track");
 
        /* ** channels ** */