diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-28 21:37:51 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-28 21:37:51 +0400 |
commit | 5ac4b38a207ab7c40d50a0fe54cc41439ce82c63 (patch) | |
tree | c0908b86645dc00559056e687afcc95cced92969 /intern | |
parent | 74e5132d111ca3e24cc09b7e30b3bc35f71fdcfd (diff) |
Cycles: preview rendering support for world/material/lamp.
Patch by Sergey, .blend by Thomas and some further tweaks by me.
Still to solve later: allow external engines to specify own preview .blend, for
now the code here is doing too much magic hacking on the preview scene still.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 21 | ||||
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 4 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 3 | ||||
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 15 | ||||
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 9 |
5 files changed, 36 insertions, 16 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 36fb5c0418d..16cfdca8977 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -39,6 +39,7 @@ class CyclesRender(bpy.types.RenderEngine): bl_idname = 'CYCLES' bl_label = "Cycles Render" bl_use_shading_nodes = True + bl_use_preview = True def __init__(self): self.session = None @@ -48,23 +49,23 @@ class CyclesRender(bpy.types.RenderEngine): # final render def update(self, data, scene): - if not self.session: - engine.create(self, data, scene) + if self.is_preview: + if not self.session: + use_osl = bpy.context.scene.cycles.shading_system + + engine.create(self, data, scene, + None, None, None, use_osl) else: - engine.reset(self, data, scene) + if not self.session: + engine.create(self, data, scene) + else: + engine.reset(self, data, scene) engine.update(self, data, scene) def render(self, scene): engine.render(self) - # preview render - # def preview_update(self, context, id): - # pass - # - # def preview_render(self): - # pass - # viewport render def view_update(self, context): if not self.session: diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index ef700ba26f1..8958ca3e42e 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -30,7 +30,7 @@ def init(): _cycles.init(path, user_path) -def create(engine, data, scene, region=0, v3d=0, rv3d=0): +def create(engine, data, scene, region=0, v3d=0, rv3d=0, preview_osl=False): import bpy import _cycles @@ -44,7 +44,7 @@ def create(engine, data, scene, region=0, v3d=0, rv3d=0): if rv3d: rv3d = rv3d.as_pointer() - engine.session = _cycles.create(engine.as_pointer(), userpref, data, scene, region, v3d, rv3d) + engine.session = _cycles.create(engine.as_pointer(), userpref, data, scene, region, v3d, rv3d, preview_osl) def free(engine): diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index fded07ab227..d05ceb51148 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1175,6 +1175,9 @@ def get_panels(): types.PARTICLE_PT_force_fields, types.PARTICLE_PT_vertexgroups, types.PARTICLE_PT_custom_props, + types.MATERIAL_PT_preview, + types.DATA_PT_preview, + types.WORLD_PT_preview, ) diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index d164920ceff..676fba76ddf 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -52,8 +52,9 @@ static PyObject *init_func(PyObject *self, PyObject *args) static PyObject *create_func(PyObject *self, PyObject *args) { PyObject *pyengine, *pyuserpref, *pydata, *pyscene, *pyregion, *pyv3d, *pyrv3d; + int preview_osl; - if(!PyArg_ParseTuple(args, "OOOOOOO", &pyengine, &pyuserpref, &pydata, &pyscene, &pyregion, &pyv3d, &pyrv3d)) + if(!PyArg_ParseTuple(args, "OOOOOOOp", &pyengine, &pyuserpref, &pydata, &pyscene, &pyregion, &pyv3d, &pyrv3d, &preview_osl)) return NULL; /* RNA */ @@ -91,14 +92,22 @@ static PyObject *create_func(PyObject *self, PyObject *args) Py_BEGIN_ALLOW_THREADS if(rv3d) { - /* interactive session */ + /* interactive viewport session */ int width = region.width(); int height = region.height(); session = new BlenderSession(engine, userpref, data, scene, v3d, rv3d, width, height); } else { - /* offline session */ + /* override some settings for preview */ + if(engine.is_preview()) { + PointerRNA cscene = RNA_pointer_get(&sceneptr, "cycles"); + + RNA_boolean_set(&cscene, "shading_system", preview_osl); + RNA_boolean_set(&cscene, "use_progressive_refine", true); + } + + /* offline session or preview render */ session = new BlenderSession(engine, userpref, data, scene); } diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 3913323c21c..650d3d387ee 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -288,7 +288,14 @@ void BlenderSession::write_render_tile(RenderTile& rtile) void BlenderSession::update_render_tile(RenderTile& rtile) { - do_write_update_render_tile(rtile, true); + /* use final write for preview renders, otherwise render result wouldn't be + * be updated in blender side + * would need to be investigated a bit further, but for now shall be fine + */ + if (!b_engine.is_preview()) + do_write_update_render_tile(rtile, true); + else + do_write_update_render_tile(rtile, false); } void BlenderSession::render() |