diff options
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 2 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 6a5ccbb0499..41591085d0a 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -22,7 +22,7 @@ bl_info = { "name": "Cycles Render Engine", "author": "", "version": (0, 0), - "blender": (2, 6, 0), + "blender": (2, 6, 2), "location": "Info header, render engine menu", "description": "Cycles Render Engine integration.", "warning": "", diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 745fb8366da..39f55aafa39 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -527,9 +527,9 @@ class CyclesWorld_PT_ambient_occlusion(CyclesButtonsPanel, Panel): layout.active = light.use_ambient_occlusion - split = layout.split() - split.prop(light, "ao_factor", text="Factor") - split.prop(light, "distance", text="Distance") + row = layout.row() + row.prop(light, "ao_factor", text="Factor") + row.prop(light, "distance", text="Distance") class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel): @@ -649,7 +649,6 @@ class CyclesTexture_PT_context(CyclesButtonsPanel, Panel): pin_id = space.pin_id use_pin_id = space.use_pin_id user = context.texture_user - # node = context.texture_node if not use_pin_id or not isinstance(pin_id, bpy.types.Texture): pin_id = None |