diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-13 12:45:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-13 12:45:55 +0400 |
| commit | 5d520c2b5a16cf7d86d4ed001857ced2ded8f8e7 (patch) | |
| tree | 6ac7654d9d94b376b7693b45566181540dc7266c /intern/cycles/blender/addon/__init__.py | |
| parent | 0c3103ac85ad57309a1f166edd81fc0ae3005049 (diff) | |
Cycles: shuffle addon import statements a bit to try to fix a strange import
error in some builds.
Diffstat (limited to 'intern/cycles/blender/addon/__init__.py')
| -rw-r--r-- | intern/cycles/blender/addon/__init__.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 0fad2ac5618..6d1b6d4f56e 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "Cycles Render Engine", "author": "", - "blender": (2, 6, 3), + "blender": (2, 6, 5), "location": "Info header, render engine menu", "description": "Cycles Render Engine integration", "warning": "", @@ -31,8 +31,8 @@ bl_info = { "category": "Render"} import bpy -from . import ui, properties, engine, presets +from . import engine class CyclesRender(bpy.types.RenderEngine): bl_idname = 'CYCLES' @@ -84,6 +84,10 @@ class CyclesRender(bpy.types.RenderEngine): def register(): + from . import ui + from . import properties + from . import presets + properties.register() ui.register() presets.register() @@ -91,6 +95,10 @@ def register(): def unregister(): + from . import ui + from . import properties + from . import presets + ui.unregister() properties.unregister() presets.unregister() |