sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: unused vars, imports, pep8

Browse Source
This commit is contained in:
Campbell Barton 2016-08-01 11:54:02 +10:00
parent 83ebec7322
commit a3ce64be5a
16 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/project_info.py
View File

@ -39,7 +39,7 @@ __all__ = (
"is_py",
"cmake_advanced_info",
"cmake_compiler_defines",
"project_name_get"
"project_name_get",
"init",
)

3
intern/cycles/blender/addon/engine.py
View File

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

1
intern/cycles/blender/addon/properties.py
View File

@ -1013,7 +1013,6 @@ class CyclesObjectSettings(bpy.types.PropertyGroup):
default=1.0,
)
@classmethod
def unregister(cls):
del bpy.types.Object.cycles

4
intern/cycles/blender/addon/ui.py
View File

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

1
intern/cycles/blender/addon/version_update.py
View File

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

5
release/scripts/modules/bl_previews_utils/bl_previews_render.py
View File

@ -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]

3
release/scripts/modules/keyingsets_utils.py
View File

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

1
release/scripts/modules/sys_info.py
View File

@ -24,7 +24,6 @@
def write_sysinfo(filepath):
import sys
import textwrap
import subprocess
import bpy

3
release/scripts/startup/bl_ui/properties_data_bone.py
View File

@ -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"

15
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

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

1
release/scripts/startup/bl_ui/space_dopesheet.py
View File

@ -103,6 +103,7 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
layout.prop(dopesheet, "use_datablock_sort", text="")
#######################################
# DopeSheet Editor - General/Standard UI

3
release/scripts/startup/bl_ui/space_image.py
View File

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

12
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -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", text="", icon='COPYDOWN')
row.operator("gpencil.paste", text="", icon='PASTEDOWN')
layout.prop(context.gpencil_data, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH') # XXX: icon
# XXX: icon
layout.prop(context.gpencil_data, "use_onion_skinning", text="Onion Skins", icon='PARTICLE_PATH')
layout.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
class VIEW3D_MT_editor_menus(Menu):
bl_space_type = 'VIEW3D_MT_editor_menus'
bl_label = ""
@ -1505,14 +1503,14 @@ class VIEW3D_MT_object_apply(Menu):
props.location, props.rotation, props.scale = False, True, True
layout.separator()
layout.operator("object.transforms_to_deltas", text="Location to Deltas", text_ctxt=i18n_contexts.default).mode = 'LOC'
layout.operator("object.transforms_to_deltas", text="Rotation to Deltas", text_ctxt=i18n_contexts.default).mode = 'ROT'
layout.operator("object.transforms_to_deltas", text="Scale to Deltas", text_ctxt=i18n_contexts.default).mode = 'SCALE'
layout.operator("object.transforms_to_deltas", text="All Transforms to Deltas", text_ctxt=i18n_contexts.default).mode = 'ALL'
layout.operator("object.anim_transforms_to_deltas")
layout.separator()
layout.operator("object.visual_transform_apply", text="Visual Transform", text_ctxt=i18n_contexts.default)

1
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -605,6 +605,7 @@ class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel):
colsub = layout.column(align=True)
colsub.prop(cps, "surface_plane", expand=True)
# ********** default tools for editmode_surface ****************
class VIEW3D_PT_tools_transform_surface(View3DPanel, Panel):

1
release/scripts/startup/keyingsets_builtins.py
View File

@ -175,6 +175,7 @@ class BUILTIN_KSI_RotScale(KeyingSetInfo):
# ------------
# Bendy Bones
class BUILTIN_KSI_BendyBones(KeyingSetInfo):
"""Insert a keyframe for each of the BBone shape properties"""

1
release/scripts/startup/nodeitems_builtins.py
View File

@ -32,6 +32,7 @@ class SortedNodeCategory(NodeCategory):
super().__init__(identifier, name, description, items)
class CompositorNodeCategory(SortedNodeCategory):
@classmethod
def poll(cls, context):