[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59437] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Aug 23 21:00:04 CEST 2013
Revision: 59437
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59437
Author: gdh
Date: 2013-08-23 19:00:04 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59392 to r59436.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59392
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59436
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_cuda.cpp
branches/soc-2013-cycles_mblur/intern/cycles/device/device_task.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cu
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_mblur/intern/cycles/render/curves.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/integrator.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/integrator.h
branches/soc-2013-cycles_mblur/intern/cycles/render/session.cpp
branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_types.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/camera.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_callbacks.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bisect_plane.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_split_edges.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_unsubdivide.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bisect_plane.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-cycles_mblur/source/blender/collada/collada_utils.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_layout.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/imageprocess.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_geometry.c
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh_tools.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59392
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59436
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp 2013-08-23 18:10:11 UTC (rev 59436)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_xml.cpp 2013-08-23 19:00:04 UTC (rev 59437)
@@ -252,10 +252,14 @@
static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node)
{
Integrator *integrator = state.scene->integrator;
+ bool branched = false;
- xml_read_bool(&integrator->progressive, node, "progressive");
+ xml_read_bool(&branched, node, "branched");
+
+ if(branched)
+ integrator->method == Integrator::BRANCHED_PATH;
- if(!integrator->progressive) {
+ if(integrator->method == Integrator::BRANCHED_PATH) {
xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples");
xml_read_int(&integrator->glossy_samples, node, "glossy_samples");
xml_read_int(&integrator->transmission_samples, node, "transmission_samples");
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py 2013-08-23 18:10:11 UTC (rev 59436)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py 2013-08-23 19:00:04 UTC (rev 59437)
@@ -97,7 +97,12 @@
('CORRELATED_MUTI_JITTER', "Correlated Multi-Jitter", "Use Correlated Multi-Jitter random sampling pattern"),
)
+enum_integrator = (
+ ('BRANCHED_PATH', "Branched Path Tracing", "Path tracing integrator that branches on the first bounce, giving more control over the number of light and material samples"),
+ ('PATH', "Path Tracing", "Pure path tracing integrator"),
+ )
+
class CyclesRenderSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -123,11 +128,13 @@
description="Use Open Shading Language (CPU rendering only)",
)
- cls.progressive = BoolProperty(
- name="Progressive",
- description="Use progressive sampling of lighting",
- default=True,
+ cls.progressive = EnumProperty(
+ name="Integrator",
+ description="Method to sample lights and materials",
+ items=enum_integrator,
+ default='PATH',
)
+
cls.use_square_samples = BoolProperty(
name="Square Samples",
description="Square sampling values for easier artist control",
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-08-23 18:10:11 UTC (rev 59436)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-08-23 19:00:04 UTC (rev 59437)
@@ -49,11 +49,13 @@
def draw_samples_info(layout, cscene):
+ integrator = cscene.progressive
+
# Calculate sample values
- if cscene.progressive:
+ if integrator == 'PATH':
aa = cscene.samples
if cscene.use_square_samples:
- aa = aa*aa
+ aa = aa * aa
else:
aa = cscene.aa_samples
d = cscene.diffuse_samples
@@ -62,27 +64,31 @@
ao = cscene.ao_samples
ml = cscene.mesh_light_samples
sss = cscene.subsurface_samples
-
+
if cscene.use_square_samples:
- aa = aa*aa
- d = d*d
- g = g*g
- t = t*t
- ao = ao*ao
- ml = ml*ml
- sss = sss*sss
-
+ aa = aa * aa
+ d = d * d
+ g = g * g
+ t = t * t
+ ao = ao * ao
+ ml = ml * ml
+ sss = sss * sss
+
# Draw interface
- col = layout.column(align=True)
- col.scale_y = 0.6
- col.label("Total Samples:")
- col.separator()
- if cscene.progressive:
- col.label("%s AA" % aa)
- else:
- col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" % (aa, d*aa, g*aa, t*aa))
+ # Do not draw for progressive, when Square Samples are disabled
+ if (integrator == 'BRANCHED_PATH') or (cscene.use_square_samples and integrator == 'PATH'):
+ col = layout.column(align=True)
+ col.scale_y = 0.6
+ col.label("Total Samples:")
col.separator()
- col.label("%s AO, %s Mesh Light, %s Subsurface" % (ao*aa, ml*aa, sss*aa))
+ if integrator == 'PATH':
+ col.label("%s AA" % aa)
+ else:
+ col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" %
+ (aa, d * aa, g * aa, t * aa))
+ col.separator()
+ col.label("%s AO, %s Mesh Light, %s Subsurface" %
+ (ao * aa, ml * aa, sss * aa))
class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
@@ -95,25 +101,25 @@
scene = context.scene
cscene = scene.cycles
device_type = context.user_preferences.system.compute_device_type
-
+
row = layout.row(align=True)
row.menu("CYCLES_MT_sampling_presets", text=bpy.types.CYCLES_MT_sampling_presets.bl_label)
row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMIN")
row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
-
+
row = layout.row()
- row.prop(cscene, "progressive")
+ row.prop(cscene, "progressive", text="")
row.prop(cscene, "use_square_samples")
-
+
split = layout.split()
-
+
col = split.column()
sub = col.column(align=True)
sub.label("Settings:")
sub.prop(cscene, "seed")
sub.prop(cscene, "sample_clamp")
- if cscene.progressive:
+ if cscene.progressive == 'PATH':
col = split.column()
sub = col.column(align=True)
sub.label(text="Samples:")
@@ -142,7 +148,7 @@
layout.separator()
layout.row().prop(cscene, "use_layer_samples")
break
-
+
draw_samples_info(layout, cscene)
@@ -279,7 +285,7 @@
col.separator()
- col.label(text="Acceleration structure:")
+ col.label(text="Acceleration structure:")
col.prop(cscene, "debug_use_spatial_splits")
@@ -413,7 +419,7 @@
row.prop(rl, "use_pass_subsurface_direct", text="Direct", toggle=True)
row.prop(rl, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
row.prop(rl, "use_pass_subsurface_color", text="Color", toggle=True)
-
+
col.separator()
col.prop(rl, "use_pass_emit", text="Emission")
col.prop(rl, "use_pass_environment")
@@ -636,7 +642,8 @@
@classmethod
def poll(cls, context):
ob = context.object
- return CyclesButtonsPanel.poll(context) and ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'}
+ return (CyclesButtonsPanel.poll(context) and
+ ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'})
def draw(self, context):
layout = self.layout
@@ -756,7 +763,7 @@
sub.prop(lamp, "size", text="Size X")
sub.prop(lamp, "size_y", text="Size Y")
- if not cscene.progressive:
+ if cscene.progressive == 'BRANCHED_PATH':
col.prop(clamp, "samples")
col = split.column()
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-08-23 18:10:11 UTC (rev 59436)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-08-23 19:00:04 UTC (rev 59437)
@@ -425,7 +425,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list