[Bf-blender-cvs] [a3ce64b] master: Cleanup: unused vars, imports, pep8
Campbell Barton
noreply at git.blender.org
Mon Aug 1 03:53:53 CEST 2016
Commit: a3ce64be5a828cbf8896be18b9c1060d5520bce8
Author: Campbell Barton
Date: Mon Aug 1 11:54:02 2016 +1000
Branches: master
https://developer.blender.org/rBa3ce64be5a828cbf8896be18b9c1060d5520bce8
Cleanup: unused vars, imports, pep8
===================================================================
M build_files/cmake/project_info.py
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/addon/version_update.py
M release/scripts/modules/bl_previews_utils/bl_previews_render.py
M release/scripts/modules/keyingsets_utils.py
M release/scripts/modules/sys_info.py
M release/scripts/startup/bl_ui/properties_data_bone.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M release/scripts/startup/keyingsets_builtins.py
M release/scripts/startup/nodeitems_builtins.py
===================================================================
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index 897b2a5..deea844 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -39,7 +39,7 @@ __all__ = (
"is_py",
"cmake_advanced_info",
"cmake_compiler_defines",
- "project_name_get"
+ "project_name_get",
"init",
)
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index d4b7535..2c5365c 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -82,7 +82,6 @@ def init():
import bpy
import _cycles
import os.path
- import sys
# Workaround possibly buggy legacy drivers which crashes on the OpenCL
# device enumeration.
@@ -103,10 +102,12 @@ def init():
_cycles.init(path, user_path, bpy.app.background)
_parse_command_line()
+
def exit():
import _cycles
_cycles.exit()
+
def create(engine, data, scene, region=None, v3d=None, rv3d=None, preview_osl=False):
import bpy
import _cycles
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 79b7751..81204eb 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1013,7 +1013,6 @@ class CyclesObjectSettings(bpy.types.PropertyGroup):
default=1.0,
)
-
@classmethod
def unregister(cls):
del bpy.types.Object.cycles
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 58c30a2..42f7970 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -887,7 +887,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel):
lamp = context.lamp
clamp = lamp.cycles
- cscene = context.scene.cycles
+ # cscene = context.scene.cycles
layout.prop(lamp, "type", expand=True)
@@ -1107,7 +1107,7 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel):
world = context.world
cworld = world.cycles
- cscene = context.scene.cycles
+ # cscene = context.scene.cycles
split = layout.split()
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 221b143..830723d 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -104,7 +104,6 @@ def vector_curve_node_remap(node):
"""
Remap values of vector curve node from normalized to absolute values
"""
- from mathutils import Vector
if node.bl_idname == 'ShaderNodeVectorCurve':
node.mapping.use_clip = False
for curve in node.mapping.curves:
diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
index 674c1c0..6c29223 100644
--- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -21,9 +21,7 @@
# Populate a template file (POT format currently) from Blender RNA/py/C data.
# Note: This script is meant to be used from inside Blender!
-import collections
import os
-import sys
import bpy
from mathutils import Vector, Euler, Matrix
@@ -67,6 +65,8 @@ def rna_backup_restore(data, backup):
def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
+ import collections
+
# Helpers.
RenderContext = collections.namedtuple("RenderContext", (
"scene", "world", "camera", "lamp", "camera_data", "lamp_data", "image", # All those are names!
@@ -362,7 +362,6 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
# File "<string>", line 327, in do_previews
# OverflowError: Python int too large to convert to C long
# ... :(
- import sys
scene = bpy.data.scenes[render_context.scene, None]
for obname in objects:
ob = bpy.data.objects[obname, None]
diff --git a/release/scripts/modules/keyingsets_utils.py b/release/scripts/modules/keyingsets_utils.py
index 375ee3f..8cef64c 100644
--- a/release/scripts/modules/keyingsets_utils.py
+++ b/release/scripts/modules/keyingsets_utils.py
@@ -28,7 +28,7 @@ __all__ = (
"RKS_POLL_selected_objects",
"RKS_POLL_selected_bones",
"RKS_POLL_selected_items",
- "RKS_ITER_selected_object",
+ "RKS_ITER_selected_objects",
"RKS_ITER_selected_bones",
"RKS_ITER_selected_item",
"RKS_GEN_available",
@@ -239,6 +239,7 @@ bbone_property_ids = (
"bone.bbone_out",
)
+
# Add Keying Set entries for bendy bones
def RKS_GEN_bendy_bones(ksi, context, ks, data):
# get id-block and path info
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index 75ac67c..b225325 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -24,7 +24,6 @@
def write_sysinfo(filepath):
import sys
- import textwrap
import subprocess
import bpy
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index 853d45e..3a54755 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -153,7 +153,7 @@ class BONE_PT_curved(BoneButtonsPanel, Panel):
def draw(self, context):
ob = context.object
bone = context.bone
- arm = context.armature
+ # arm = context.armature
pchan = None
if ob and bone:
@@ -268,7 +268,6 @@ class BONE_PT_relations(BoneButtonsPanel, Panel):
sub.prop(bone, "use_local_location")
-
class BONE_PT_display(BoneButtonsPanel, Panel):
bl_label = "Display"
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index ac41268..baa70ed 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -63,7 +63,7 @@ class GreasePencilDrawingToolsPanel:
def draw(self, context):
layout = self.layout
- is_3d_view = context.space_data.type == 'VIEW_3D'
+ is_3d_view = context.space_data.type == 'VIEW_3D'
is_clip_editor = context.space_data.type == 'CLIP_EDITOR'
col = layout.column(align=True)
@@ -136,7 +136,7 @@ class GreasePencilStrokeEditPanel:
def draw(self, context):
layout = self.layout
- is_3d_view = context.space_data.type == 'VIEW_3D'
+ is_3d_view = context.space_data.type == 'VIEW_3D'
if not is_3d_view:
layout.label(text="Select:")
@@ -214,13 +214,13 @@ class GreasePencilStrokeSculptPanel:
layout.separator()
- if settings.tool == 'THICKNESS':
+ if tool == 'THICKNESS':
layout.row().prop(brush, "direction", expand=True)
- elif settings.tool == 'PINCH':
+ elif tool == 'PINCH':
row = layout.row(align=True)
row.prop_enum(brush, "direction", 'ADD', text="Pinch")
row.prop_enum(brush, "direction", 'SUBTRACT', text="Inflate")
- elif settings.tool == 'TWIST':
+ elif tool == 'TWIST':
row = layout.row(align=True)
row.prop_enum(brush, "direction", 'SUBTRACT', text="CW")
row.prop_enum(brush, "direction", 'ADD', text="CCW")
@@ -228,7 +228,7 @@ class GreasePencilStrokeSculptPanel:
layout.separator()
layout.prop(settings, "use_select_mask")
- if settings.tool == 'SMOOTH':
+ if tool == 'SMOOTH':
layout.prop(brush, "affect_pressure")
@@ -581,14 +581,13 @@ class GreasePencilDataPanel:
col.active = not gpl.lock
col.prop(gpl, "line_width", slider=True)
-
split = layout.split(percentage=0.5)
split.active = not gpl.lock
col = split.column(align=True)
col.prop(gpl, "use_volumetric_strokes")
col.prop(gpl, "show_points", text="Points")
-
+
col = split.column(align=True)
col.prop(gpl, "use_hq_fill")
col.prop(gpl, "show_x_ray")
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index d6d9198..4d365c8 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -103,6 +103,7 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
layout.prop(dopesheet, "use_datablock_sort", text="")
+
#######################################
# DopeSheet Editor - General/Standard UI
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index c191a4b..9f719bc 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -729,7 +729,6 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
@classmethod
def poll(cls, context):
sima = context.space_data
- toolsettings = context.tool_settings.image_paint
return sima.show_paint
@@ -987,7 +986,7 @@ class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel):
layout = self.layout
toolsettings = context.tool_settings
- brush = toolsettings.image_paint.brush
+ # brush = toolsettings.image_paint.brush
ups = toolsettings.unified_paint_settings
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fdf0996..681fa8e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -37,7 +37,6 @@ class VIEW3D_HT_header(Header):
row = layout.row(align=True)
row.template_header()
- sub = row.row(align=True)
VIEW3D_MT_editor_menus.draw_collapsible(context, layout)
@@ -137,13 +136,12 @@ class VIEW3D_HT_header(Header):
row.operator("gpencil.copy",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list