Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-08-01 04:54:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-08-01 04:55:06 +0300
commita3ce64be5a828cbf8896be18b9c1060d5520bce8 (patch)
tree062bf09611f6a4b3fc179bd9b0f6a0cde14bd421 /intern
parent83ebec73223448bb4f97f30dd930235431eb6516 (diff)
Cleanup: unused vars, imports, pep8
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/engine.py3
-rw-r--r--intern/cycles/blender/addon/properties.py1
-rw-r--r--intern/cycles/blender/addon/ui.py4
-rw-r--r--intern/cycles/blender/addon/version_update.py1
4 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index d4b7535b9ee..2c5365c9189 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 79b77516ae7..81204eb8ae0 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 58c30a2d15a..42f7970769a 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 221b1437128..830723d6149 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: