[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39747] branches/cycles: Cycles:
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Aug 28 15:55:59 CEST 2011
Revision: 39747
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39747
Author: blendix
Date: 2011-08-28 13:55:59 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Cycles:
* Add alpha pass output, to use set Transparent option in Film panel.
* Add Holdout closure (OSL terminology), this is like the Sky option in the
internal renderer, objects with this closure show the background / zero
alpha.
* Add option to use Gaussian instead of Box pixel filter in the UI.
* Remove camera response curves for now, they don't really belong here in
the pipeline, should be moved to compositor.
* Output full float values for rendering now, previously was only byte precision.
* Add a patch from Thomas to get a preview passes option, but still disabled
because it isn't quite working right yet.
* CUDA: don't compile shader graph evaluation inline.
* Convert tabs to spaces in python files.
Modified Paths:
--------------
branches/cycles/intern/cycles/app/cycles_test.cpp
branches/cycles/intern/cycles/blender/addon/__init__.py
branches/cycles/intern/cycles/blender/addon/engine.py
branches/cycles/intern/cycles/blender/addon/enums.py
branches/cycles/intern/cycles/blender/addon/properties.py
branches/cycles/intern/cycles/blender/addon/ui.py
branches/cycles/intern/cycles/blender/addon/xml.py
branches/cycles/intern/cycles/blender/blender_session.cpp
branches/cycles/intern/cycles/blender/blender_shader.cpp
branches/cycles/intern/cycles/blender/blender_sync.cpp
branches/cycles/intern/cycles/cmake/external_libs.cmake
branches/cycles/intern/cycles/device/device.cpp
branches/cycles/intern/cycles/device/device.h
branches/cycles/intern/cycles/device/device_cuda.cpp
branches/cycles/intern/cycles/device/device_multi.cpp
branches/cycles/intern/cycles/kernel/kernel.cpp
branches/cycles/intern/cycles/kernel/kernel_compat_cuda.h
branches/cycles/intern/cycles/kernel/kernel_compat_opencl.h
branches/cycles/intern/cycles/kernel/kernel_film.h
branches/cycles/intern/cycles/kernel/kernel_path.h
branches/cycles/intern/cycles/kernel/kernel_shader.h
branches/cycles/intern/cycles/kernel/kernel_textures.h
branches/cycles/intern/cycles/kernel/kernel_types.h
branches/cycles/intern/cycles/kernel/osl/osl_shader.cpp
branches/cycles/intern/cycles/kernel/osl/osl_shader.h
branches/cycles/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/cycles/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/cycles/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/cycles/intern/cycles/kernel/svm/bsdf_reflection.h
branches/cycles/intern/cycles/kernel/svm/bsdf_refraction.h
branches/cycles/intern/cycles/kernel/svm/bsdf_transparent.h
branches/cycles/intern/cycles/kernel/svm/bsdf_ward.h
branches/cycles/intern/cycles/kernel/svm/bsdf_westin.h
branches/cycles/intern/cycles/kernel/svm/svm.h
branches/cycles/intern/cycles/kernel/svm/svm_closure.h
branches/cycles/intern/cycles/kernel/svm/svm_convert.h
branches/cycles/intern/cycles/kernel/svm/svm_types.h
branches/cycles/intern/cycles/render/CMakeLists.txt
branches/cycles/intern/cycles/render/background.cpp
branches/cycles/intern/cycles/render/background.h
branches/cycles/intern/cycles/render/buffers.cpp
branches/cycles/intern/cycles/render/buffers.h
branches/cycles/intern/cycles/render/camera.h
branches/cycles/intern/cycles/render/film.cpp
branches/cycles/intern/cycles/render/film.h
branches/cycles/intern/cycles/render/film_response.h
branches/cycles/intern/cycles/render/filter.cpp
branches/cycles/intern/cycles/render/filter.h
branches/cycles/intern/cycles/render/mesh.cpp
branches/cycles/intern/cycles/render/nodes.cpp
branches/cycles/intern/cycles/render/nodes.h
branches/cycles/intern/cycles/render/scene.h
branches/cycles/intern/cycles/render/session.cpp
branches/cycles/intern/cycles/render/session.h
branches/cycles/intern/cycles/render/tile.cpp
branches/cycles/intern/cycles/render/tile.h
branches/cycles/intern/cycles/util/util_color.h
branches/cycles/intern/cycles/util/util_types.h
branches/cycles/source/blender/blenkernel/BKE_node.h
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree_types.h
branches/cycles/source/blender/nodes/CMakeLists.txt
branches/cycles/source/blender/nodes/SHD_node.h
Added Paths:
-----------
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_holdout.c
Modified: branches/cycles/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/cycles/intern/cycles/app/cycles_test.cpp 2011-08-28 11:39:18 UTC (rev 39746)
+++ branches/cycles/intern/cycles/app/cycles_test.cpp 2011-08-28 13:55:59 UTC (rev 39747)
@@ -85,7 +85,7 @@
static void session_init()
{
options.session = new Session(options.session_params);
- options.session->reset(options.width, options.height);
+ options.session->reset(options.width, options.height, options.session_params.passes);
options.session->scene = options.scene;
if(options.session_params.background && !options.quiet)
@@ -162,13 +162,13 @@
options.height= height;
if(options.session)
- options.session->reset(options.width, options.height);
+ options.session->reset(options.width, options.height, options.session_params.passes);
}
void keyboard(unsigned char key)
{
if(key == 'r')
- options.session->reset(options.width, options.height);
+ options.session->reset(options.width, options.height, options.session_params.passes);
else if(key == 27) // escape
options.session->progress.set_cancel("Cancelled");
}
@@ -285,7 +285,7 @@
int main(int argc, const char **argv)
{
- path_init("../blender/intern/cycles");
+ path_init("../build/bin/2.59/scripts/addons/cycles/");
options_parse(argc, argv);
Modified: branches/cycles/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/__init__.py 2011-08-28 11:39:18 UTC (rev 39746)
+++ branches/cycles/intern/cycles/blender/addon/__init__.py 2011-08-28 13:55:59 UTC (rev 39747)
@@ -37,50 +37,50 @@
from cycles import engine
class CyclesRender(bpy.types.RenderEngine):
- bl_idname = 'CYCLES'
- bl_label = "Cycles"
+ bl_idname = 'CYCLES'
+ bl_label = "Cycles"
- def __init__(self):
- engine.init()
- self.session = None
-
- def __del__(self):
- engine.free(self)
+ def __init__(self):
+ engine.init()
+ self.session = None
+
+ def __del__(self):
+ engine.free(self)
- # final render
- def update(self, data, scene):
- engine.create(self, data, scene)
- engine.update(self, data, scene)
+ # final render
+ def update(self, data, scene):
+ engine.create(self, data, scene)
+ engine.update(self, data, scene)
- def render(self):
- engine.render(self)
+ def render(self):
+ 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:
- engine.create(self, context.blend_data, context.scene,
- context.region, context.space_data, context.region_data)
- engine.update(self, context.blend_data, context.scene)
+ # 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:
+ engine.create(self, context.blend_data, context.scene,
+ context.region, context.space_data, context.region_data)
+ engine.update(self, context.blend_data, context.scene)
- def view_draw(self, context):
- engine.draw(self, context.region, context.space_data, context.region_data)
+ def view_draw(self, context):
+ engine.draw(self, context.region, context.space_data, context.region_data)
def register():
- properties.register()
- ui.register()
- xml.register()
- bpy.utils.register_module(__name__)
+ properties.register()
+ ui.register()
+ xml.register()
+ bpy.utils.register_module(__name__)
def unregister():
- xml.unregister()
- ui.unregister()
- properties.unregister()
- bpy.utils.unregister_module(__name__)
+ xml.unregister()
+ ui.unregister()
+ properties.unregister()
+ bpy.utils.unregister_module(__name__)
Modified: branches/cycles/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/engine.py 2011-08-28 11:39:18 UTC (rev 39746)
+++ branches/cycles/intern/cycles/blender/addon/engine.py 2011-08-28 13:55:59 UTC (rev 39747)
@@ -19,52 +19,52 @@
import bpy
def init():
- import libcycles_blender as lib
- import os.path
- lib.init(os.path.dirname(__file__))
+ import libcycles_blender as lib
+ import os.path
+ lib.init(os.path.dirname(__file__))
def create(engine, data, scene, region = 0, v3d = 0, rv3d = 0):
- import libcycles_blender as lib
+ import libcycles_blender as lib
- data = data.as_pointer()
- scene = scene.as_pointer()
- if region:
- region = region.as_pointer()
- if v3d:
- v3d = v3d.as_pointer()
- if rv3d:
- rv3d = rv3d.as_pointer()
+ data = data.as_pointer()
+ scene = scene.as_pointer()
+ if region:
+ region = region.as_pointer()
+ if v3d:
+ v3d = v3d.as_pointer()
+ if rv3d:
+ rv3d = rv3d.as_pointer()
- engine.session = lib.create(engine.as_pointer(), data, scene, region, v3d, rv3d)
+ engine.session = lib.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)
- del engine.session
+ if "session" in dir(engine):
+ if engine.session:
+ import libcycles_blender as lib
+ lib.free(engine.session)
+ del engine.session
def render(engine):
- import libcycles_blender as lib
- lib.render(engine.session)
+ import libcycles_blender as lib
+ lib.render(engine.session)
def update(engine, data, scene):
- import libcycles_blender as lib
- lib.sync(engine.session)
+ import libcycles_blender as lib
+ lib.sync(engine.session)
def draw(engine, region, v3d, rv3d):
- import libcycles_blender as lib
- v3d = v3d.as_pointer()
- rv3d = rv3d.as_pointer()
+ import libcycles_blender as lib
+ v3d = v3d.as_pointer()
+ rv3d = rv3d.as_pointer()
- # draw render image
- lib.draw(engine.session, v3d, rv3d)
+ # draw render image
+ lib.draw(engine.session, v3d, rv3d)
def available_devices():
- import libcycles_blender as lib
- return lib.available_devices()
+ import libcycles_blender as lib
+ return lib.available_devices()
def with_osl():
- import libcycles_blender as lib
- return lib.with_osl()
+ import libcycles_blender as lib
+ return lib.with_osl()
Modified: branches/cycles/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/enums.py 2011-08-28 11:39:18 UTC (rev 39746)
+++ branches/cycles/intern/cycles/blender/addon/enums.py 2011-08-28 13:55:59 UTC (rev 39747)
@@ -33,81 +33,8 @@
("DYNAMIC_BVH", "Dynamic BVH", "Objects can be individually updated, at the cost of slower render time"),
("STATIC_BVH", "Static BVH", "Any object modification requires a complete BVH rebuild, but renders faster"))
-response_curves = (
-("None", "None", ""),
-("", "Agfa", ""),
-("Agfacolor Futura 100", "Futura 100", ""),
-("Agfacolor Futura 200", "Futura 200", ""),
-("Agfacolor Futura 400", "Futura 400", ""),
-("Agfacolor Futura II 100", "Futura II 100", ""),
-("Agfacolor Futura II 200", "Futura II 200", ""),
-("Agfacolor Futura II 400", "Futura II 400", ""),
-("Agfacolor HDC 100 plus", "HDC 100 plus", ""),
-("Agfacolor HDC 400 plus", "HDC 400 plus", ""),
-("Agfacolor HDC 200 plus", "HDC 200 plus", ""),
-("Agfacolor Optima II 100", "Optima II 100", ""),
-("Agfacolor Optima II 200", "Optima II 200", ""),
-("Agfacolor Ultra 050", "Ultra 050", ""),
-("", "Agfa", ""),
-("Agfacolor Vista 100", "Vista 100", ""),
-("Agfacolor Vista 200", "Vista 200", ""),
-("Agfacolor Vista 400", "Vista 400", ""),
-("Agfacolor Vista 800", "Vista 800", ""),
-("Agfachrome CT Precisa 100", "CT Precisa 100", ""),
-("Agfachrome CT Precisa 200", "CT Precisa 200", ""),
-("Agfachrome RSX2 050", "Agfachrome RSX2 050", ""),
-("Agfachrome RSX2 100", "Agfachrome RSX2 100", ""),
-("Agfachrome RSX2 200", "Agfachrome RSX2 200", ""),
-("Advantix 100", "Advantix 100", ""),
-("Advantix 200", "Advantix 200", ""),
-("Advantix 400", "Advantix 400", ""),
-("", "Kodak", ""),
-("Gold 100", "Gold 100", ""),
-("Gold 200", "Gold 200", ""),
-("Max Zoom 800", "Max Zoom 800", ""),
-("Portra 100T", "Portra 100T", ""),
-("Portra 160NC", "Portra 160NC", ""),
-("Portra 160VC", "Portra 160VC", ""),
-("Portra 800", "Portra 800", ""),
-("Portra 400VC", "Portra 400VC", ""),
-("Portra 400NC", "Portra 400NC", ""),
-("", "Kodak", ""),
-("Ektachrome 100 plus", "Ektachrome 100 plus", ""),
-("Ektachrome 320T", "Ektachrome 320T", ""),
-("Ektachrome 400X", "Ektachrome 400X", ""),
-("Ektachrome 64", "Ektachrome 64", ""),
-("Ektachrome 64T", "Ektachrome 64T", ""),
-("Ektachrome E100S", "Ektachrome E100S", ""),
-("Ektachrome 100", "Ektachrome 100", ""),
-("Kodachrome 200", "Kodachrome 200", ""),
-("Kodachrome 25", "Kodachrome 25", ""),
-("Kodachrome 64", "Kodachrome 64", ""),
-#("DSCS 3151", "DSCS 3151", ""),
-#("DSCS 3152", "DSCS 3152", ""),
-#("DSCS 3153", "DSCS 3153", ""),
-#("DSCS 3154", "DSCS 3154", ""),
-#("DSCS 3155", "DSCS 3155", ""),
-#("DSCS 3156", "DSCS 3156", ""),
-#("KAI-0311", "KAI-0311", ""),
-#("KAF-2001", "KAF-2001", ""),
-#("KAF-3000", "KAF-3000", ""),
-#("KAI-0372", "KAI-0372", ""),
-#("KAI-1010", "KAI-1010", ""),
-("", "Fujifilm", ""),
-("F-125", "F-125", ""),
-("F-250", "F-250", ""),
-("F-400", "F-400", ""),
-("FCI", "FCI", ""),
-("FP2900Z", "FP2900Z", ""),
-("", "Eastman", ""),
-("Double X Neg 12min", "Double X Neg 12min", ""),
-("Double X Neg 6min", "Double X Neg 6min", ""),
-("Double X Neg 5min", "Double X Neg 5min", ""),
-("Double X Neg 4min", "Double X Neg 4min", ""),
-("", "Canon", ""),
-("Optura 981111", "Optura 981111", ""),
-("Optura 981113", "Optura 981113", ""),
-("Optura 981114", "Optura 981114", ""),
-("Optura 981111.SLRR", "Optura 981111.SLRR", "")
-)
+filter_types = (
+("BOX", "Box", "Box filter"),
+("GAUSSIAN", "Gaussian", "Gaussian filter"))
+
Modified: branches/cycles/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/properties.py 2011-08-28 11:39:18 UTC (rev 39746)
+++ branches/cycles/intern/cycles/blender/addon/properties.py 2011-08-28 13:55:59 UTC (rev 39747)
@@ -22,99 +22,117 @@
from cycles import enums
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list