[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59393] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Aug 23 01:15:46 CEST 2013
Revision: 59393
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59393
Author: gdh
Date: 2013-08-22 23:15:45 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59377 to r59392.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59377
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59392
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/presets.py
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_object.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-cycles_mblur/release/datafiles/prvicons.png
branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom_inline.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_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-cycles_mblur/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_draw.c
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bisect_plane.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
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-59376
+ /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
Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-08-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-08-22 23:15:45 UTC (rev 59393)
@@ -212,6 +212,7 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
+_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
# OSL needs to be compiled for now!
OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -2776,7 +2778,7 @@
if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang
have_llvm=true
- LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+ LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-08-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-08-22 23:15:45 UTC (rev 59393)
@@ -799,4 +799,35 @@
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
+
endmacro()
+
+macro(svg_to_png
+ file_from
+ file_to
+ dpi
+ list_to_add)
+
+ # remove ../'s
+ get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+ get_filename_component(_file_to ${CMAKE_CURRENT_SOURCE_DIR}/${file_to} REALPATH)
+
+ list(APPEND ${list_to_add} ${_file_to})
+
+ find_program(INKSCAPE_EXE inkscape)
+ mark_as_advanced(INKSCAPE_EXE)
+
+ if(INKSCAPE_EXE)
+ add_custom_command(
+ OUTPUT ${_file_to}
+ COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
+ DEPENDS ${_file_from} ${INKSCAPE_EXE}
+ )
+ else()
+ message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
+ endif()
+
+ unset(_file_from)
+ unset(_file_to)
+
+endmacro()
\ No newline at end of file
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/presets.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/presets.py 2013-08-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/presets.py 2013-08-22 23:15:45 UTC (rev 59393)
@@ -67,7 +67,7 @@
"cycles.subsurface_samples",
"cycles.no_caustics",
"cycles.blur_glossy",
- "cycles.squared_samples",
+ "cycles.use_square_samples",
"cycles.progressive"
]
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-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/properties.py 2013-08-22 23:15:45 UTC (rev 59393)
@@ -128,8 +128,8 @@
description="Use progressive sampling of lighting",
default=True,
)
- cls.squared_samples = BoolProperty(
- name="Squared Samples",
+ cls.use_square_samples = BoolProperty(
+ name="Square Samples",
description="Square sampling values for easier artist control",
default=False,
)
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-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-08-22 23:15:45 UTC (rev 59393)
@@ -48,6 +48,43 @@
return rd.engine == 'CYCLES'
+def draw_samples_info(layout, cscene):
+ # Calculate sample values
+ if cscene.progressive:
+ aa = cscene.samples
+ if cscene.use_square_samples:
+ aa = aa*aa
+ else:
+ aa = cscene.aa_samples
+ d = cscene.diffuse_samples
+ g = cscene.glossy_samples
+ t = cscene.transmission_samples
+ 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
+
+ # 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))
+ col.separator()
+ col.label("%s AO, %s Mesh Light, %s Subsurface" % (ao*aa, ml*aa, sss*aa))
+
+
class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
bl_label = "Sampling"
bl_options = {'DEFAULT_CLOSED'}
@@ -63,13 +100,11 @@
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, "use_square_samples")
- if not cscene.progressive:
- row.prop(cscene, "squared_samples")
-
split = layout.split()
col = split.column()
@@ -107,6 +142,8 @@
layout.separator()
layout.row().prop(cscene, "use_layer_samples")
break
+
+ draw_samples_info(layout, cscene)
class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp 2013-08-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp 2013-08-22 23:15:45 UTC (rev 59393)
@@ -205,7 +205,7 @@
light->use_mis = get_boolean(clamp, "use_multiple_importance_sampling");
int samples = get_int(clamp, "samples");
- if(get_boolean(cscene, "squared_samples"))
+ if(get_boolean(cscene, "use_square_samples"))
light->samples = samples * samples;
else
light->samples = samples;
@@ -243,7 +243,7 @@
light->shader = scene->default_background;
int samples = get_int(cworld, "samples");
- if(get_boolean(cscene, "squared_samples"))
+ if(get_boolean(cscene, "use_square_samples"))
light->samples = samples * samples;
else
light->samples = samples;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp 2013-08-22 20:00:18 UTC (rev 59392)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.cpp 2013-08-22 23:15:45 UTC (rev 59393)
@@ -200,7 +200,7 @@
int mesh_light_samples = get_int(cscene, "mesh_light_samples");
int subsurface_samples = get_int(cscene, "subsurface_samples");
- if(get_boolean(cscene, "squared_samples")) {
+ if(get_boolean(cscene, "use_square_samples")) {
integrator->diffuse_samples = diffuse_samples * diffuse_samples;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list