diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 21:13:32 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 21:13:32 +0400 |
commit | dca15b215d994c7bafe9398493a9db1b4df00246 (patch) | |
tree | 545d3e588adac563250356f17bf3989b5e2bd840 /intern/cycles | |
parent | 5ef9039b7e2ea16bd4b651aab21d5aa690485569 (diff) | |
parent | 69ad40f9ea81ddf5cd0d83dc21cc7f66a8008765 (diff) |
Cycles: svn merge -r41613:41627 ^/trunk/blender
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 32 | ||||
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index 8cd7be567e6..097909ca058 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -19,16 +19,16 @@ import bpy def init(): - import libcycles_blender as lib + import bcycles import os.path path = os.path.dirname(__file__) user_path = os.path.dirname(os.path.abspath(bpy.utils.user_resource('CONFIG', ''))) - lib.init(path, user_path) + bcycles.init(path, user_path) def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0): - import libcycles_blender as lib + import bcycles data = data.as_pointer() scene = scene.as_pointer() @@ -39,36 +39,36 @@ def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0): if rv3d: rv3d = rv3d.as_pointer() - engine.session = lib.create(engine.as_pointer(), data, scene, region, v3d, rv3d) + engine.session = bcycles.create(engine.as_pointer(), data, scene, region, v3d, rv3d) def free(engine): if "session" in dir(engine): if engine.session: - import libcycles_blender as lib - lib.free(engine.session) + import bcycles + bcycles.free(engine.session) del engine.session def render(engine): - import libcycles_blender as lib - lib.render(engine.session) + import bcycles + bcycles.render(engine.session) def update(engine, data, scene): - import libcycles_blender as lib - lib.sync(engine.session) + import bcycles + bcycles.sync(engine.session) def draw(engine, region, v3d, rv3d): - import libcycles_blender as lib + import bcycles v3d = v3d.as_pointer() rv3d = rv3d.as_pointer() # draw render image - lib.draw(engine.session, v3d, rv3d) + bcycles.draw(engine.session, v3d, rv3d) def available_devices(): - import libcycles_blender as lib - return lib.available_devices() + import bcycles + return bcycles.available_devices() def with_osl(): - import libcycles_blender as lib - return lib.with_osl() + import bcycles + return bcycles.with_osl() diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 1026d420c02..58049bb8cbe 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -194,8 +194,8 @@ static PyMethodDef methods[] = { static struct PyModuleDef module = { PyModuleDef_HEAD_INIT, - "libcycles_blender", - "Blender RNA to render exporter", + "bcycles", + "Blender cycles render integration", -1, methods, NULL, NULL, NULL, NULL |