diff options
-rw-r--r-- | build_files/cmake/cmake_static_check_cppcheck.py | 2 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/object.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object_constraint.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 2 | ||||
-rw-r--r-- | source/tests/bl_run_operators.py | 2 |
9 files changed, 24 insertions, 18 deletions
diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index 6c13f3a079a..436470a7020 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -37,7 +37,7 @@ CHECKER_BIN = "cppcheck" CHECKER_ARGS = [ # not sure why this is needed, but it is. "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"), - "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR, + "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR, # "--max-configs=1", # speeds up execution # "--check-config", # when includes are missing # "--enable=all", # if you want sixty hundred pedantic suggestions diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index c82ab9ce624..c966792ed29 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -370,7 +370,7 @@ class CyclesObject_PT_ray_visibility(CyclesButtonsPanel, Panel): visibility = ob.cycles_visibility flow = layout.column_flow() - + flow.prop(visibility, "camera") flow.prop(visibility, "diffuse") flow.prop(visibility, "glossy") diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 923a259c69c..b7c6b858913 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -493,7 +493,8 @@ class ShapeTransfer(Operator): def execute(self, context): ob_act = context.active_object - objects = [ob for ob in context.selected_editable_objects if ob != ob_act] + objects = [ob for ob in context.selected_editable_objects + if ob != ob_act] if 1: # swap from/to, means we cant copy to many at once. if len(objects) != 1: diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 766daba58b8..354b70c19c2 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -814,12 +814,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def REMESH(self, layout, ob, md): layout.prop(md, "mode") - + row = layout.row() row.prop(md, "octree_depth") row.prop(md, "scale") - if md.mode == "SHARP": + if md.mode == 'SHARP': layout.prop(md, "sharpness") layout.prop(md, "remove_disconnected_pieces") diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py index dff23e6238f..68c00691122 100644 --- a/release/scripts/startup/bl_ui/properties_object_constraint.py +++ b/release/scripts/startup/bl_ui/properties_object_constraint.py @@ -435,23 +435,23 @@ class ConstraintButtonsPanel(): self.target_template(layout, con) split = layout.split() - + col = split.column() col.label(text="From Target:") col.prop(con, "transform_channel", text="") col.prop(con, "target_space", text="") - + col = split.column() col.label(text="To Action:") col.prop(con, "action", text="") - + split = layout.split() - + col = split.column(align=True) col.label(text="Target Range:") col.prop(con, "min", text="Min") col.prop(con, "max", text="Max") - + col = split.column(align=True) col.label(text="Action Range:") col.prop(con, "frame_start", text="Start") diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index c879609de95..8ebc1c450b4 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -128,9 +128,12 @@ class CLIP_PT_tools_marker(Panel): col.separator() row = col.row(align=True) - row.prop(settings, "use_default_red_channel", text="R", toggle=True) - row.prop(settings, "use_default_green_channel", text="G", toggle=True) - row.prop(settings, "use_default_blue_channel", text="B", toggle=True) + row.prop(settings, "use_default_red_channel", + text="R", toggle=True) + row.prop(settings, "use_default_green_channel", + text="G", toggle=True) + row.prop(settings, "use_default_blue_channel", + text="B", toggle=True) col.separator() @@ -155,7 +158,8 @@ class CLIP_PT_tools_marker(Panel): col.prop(settings, "default_pattern_match", text="") col.separator() - col.operator('clip.track_settings_as_default', text="Copy From Active Track") + col.operator('clip.track_settings_as_default', + text="Copy From Active Track") class CLIP_PT_tools_tracking(Panel): diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index a41ae92b4b6..c0cc692f2f1 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -21,6 +21,7 @@ import bpy from bpy.types import Header, Menu, Panel from .properties_paint_common import UnifiedPaintPanel + class ImagePaintPanel(UnifiedPaintPanel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' @@ -677,7 +678,7 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel): row = col.row(align=True) self.prop_unified_strength(row, context, brush, "strength", slider=True, text="Strength") self.prop_unified_strength(row, context, brush, "use_pressure_strength") - + row = col.row(align=True) row.prop(brush, "jitter", slider=True) row.prop(brush, "use_pressure_jitter", toggle=True, text="") @@ -826,7 +827,7 @@ class IMAGE_UV_sculpt(Panel, ImagePaintPanel): row = col.row(align=True) self.prop_unified_strength(row, context, brush, "strength", slider=True, text="Strength") self.prop_unified_strength(row, context, brush, "use_pressure_strength") - + split = layout.split() col = split.column() diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index d29dff49132..0114f33928a 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -58,7 +58,7 @@ class NODE_HT_header(Header): # Don't show "Use Nodes" Button when Engine is BI for Lamps if snode_id and not (scene.render.use_shading_nodes == 0 and ob.type == 'LAMP'): layout.prop(snode_id, "use_nodes") - + if snode.shader_type == 'WORLD': layout.template_ID(scene, "world", new="world.new") if snode_id: diff --git a/source/tests/bl_run_operators.py b/source/tests/bl_run_operators.py index b3781e94696..08e9d5d59e4 100644 --- a/source/tests/bl_run_operators.py +++ b/source/tests/bl_run_operators.py @@ -142,7 +142,7 @@ def bpy_check_type_duplicates(): # non essential sanity check bl_types = dir(bpy.types) bl_types_unique = set(bl_types) - + if len(bl_types) != len(bl_types_unique): print("Error, found duplicates in 'bpy.types'") for t in sorted(bl_types_unique): |