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-02-13 01:51:33 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-13 01:52:12 +0400
commitaea00c7a81de90fd3f0b976ee1a7d5040c9f18e7 (patch)
treeade0cea55687b6b69673adb7ea4ad24e61b4adf8 /intern
parent8547d17739d1fc6eb2bd648af8dadae809865614 (diff)
Code cleanup: style
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/engine.py3
-rw-r--r--intern/cycles/blender/addon/properties.py4
-rw-r--r--intern/cycles/blender/addon/ui.py3
3 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 66dc5e78e5a..b9ce65588df 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -88,7 +88,8 @@ def available_devices():
def with_osl():
import _cycles
return _cycles.with_osl
-
+
+
def with_network():
import _cycles
return _cycles.with_network
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 0f0bff2acfb..c80e8a3250c 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -33,7 +33,7 @@ enum_devices = (
)
if _cycles.with_network:
- enum_devices += (('NETWORK', "Networked Device", "Use networked device for rendering"),)
+ enum_devices += (('NETWORK', "Networked Device", "Use networked device for rendering"),)
enum_feature_set = (
('SUPPORTED', "Supported", "Only use finished and supported features"),
@@ -371,7 +371,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
min=0.0, max=1e8,
default=0.0,
)
-
+
cls.sample_clamp_indirect = FloatProperty(
name="Clamp Indirect",
description="If non-zero, the maximum value for an indirect sample, "
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 65eb75a2f6f..c0ce80426c0 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1195,7 +1195,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):
layout.prop(ccscene, "primitive", text="Primitive")
layout.prop(ccscene, "shape", text="Shape")
- if (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'} and ccscene.shape == 'RIBBONS') == False:
+ if not (ccscene.primitive in {'CURVE_SEGMENTS', 'LINE_SEGMENTS'} and ccscene.shape == 'RIBBONS'):
layout.prop(ccscene, "cull_backfacing", text="Cull back-faces")
if ccscene.primitive == 'TRIANGLES' and ccscene.shape == 'THICK':
@@ -1382,6 +1382,7 @@ def get_panels():
return [getattr(types, p) for p in panels if hasattr(types, p)]
+
def register():
bpy.types.RENDER_PT_render.append(draw_device)
bpy.types.VIEW3D_HT_header.append(draw_pause)