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>2014-07-22 06:03:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-07-22 06:03:15 +0400
commit200dd87de1726d7b6f61b9cfa3b2beea6ceba6cd (patch)
tree222e5faf2726fb5b78e489d900d7227848745cf0 /intern
parent88f126f2ebd615aac01272e2284392b48a5f90ec (diff)
Cleanup: pep8 & redundant vars
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/engine.py1
-rw-r--r--intern/cycles/blender/addon/ui.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 21a92a29cfc..18235eca790 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -65,6 +65,7 @@ def bake(engine, obj, pass_type, pixel_array, num_pixels, depth, result):
if session is not None:
_cycles.bake(engine.session, obj.as_pointer(), pass_type, pixel_array.as_pointer(), num_pixels, depth, result.as_pointer())
+
def reset(engine, data, scene):
import _cycles
data = data.as_pointer()
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 35ae8ecb7c1..4a13f265d14 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1244,13 +1244,13 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel):
scene = context.scene
cscene = scene.cycles
cbk = scene.render.bake
-
+
layout.operator("object.bake", icon='RENDER_STILL').type = cscene.bake_type
-
+
col = layout.column()
col.prop(cscene, "bake_type")
col.separator()
-
+
split = layout.split()
col = split.column()