[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57546] branches/soc-2013-depsgraph_mt: Merging r57518 through r57545 from trunk into soc-20133-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Jun 18 13:33:14 CEST 2013
Revision: 57546
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57546
Author: nazgul
Date: 2013-06-18 11:33:13 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Merging r57518 through r57545 from trunk into soc-20133-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57545
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/CMakeLists.txt
branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/cycles/SConscript
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/properties.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_types.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/light.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/object.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/osl.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/shader.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/shader.h
branches/soc-2013-depsgraph_mt/intern/cycles/render/svm.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_types.h
branches/soc-2013-depsgraph_mt/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-depsgraph_mt/source/creator/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_KetsjiEngine.h
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57517
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57545
Modified: branches/soc-2013-depsgraph_mt/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/CMakeLists.txt 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/CMakeLists.txt 2013-06-18 11:33:13 UTC (rev 57546)
@@ -1124,26 +1124,22 @@
${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
)
- set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+ ${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+ ${OPENCOLLADA}/lib/opencollada/xml.lib
+ ${OPENCOLLADA}/lib/opencollada/buffer.lib
+ ${OPENCOLLADA}/lib/opencollada/ftoa.lib
+ ${OPENCOLLADA}/lib/opencollada/UTF.lib
)
set(PCRE_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+ ${OPENCOLLADA}/lib/opencollada/pcre.lib
)
-
- unset(OPENCOLLADA_LIBPATH)
-
endif()
if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set_lib_path(OPENEXR "openexr")
+ set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1199,18 +1195,11 @@
endif()
if(WITH_PYTHON)
- # normally cached but not since we include them with blender
- if(MSVC10)
- set(PYTHON_VERSION 3.3) # CACHE STRING)
- else()
- set(PYTHON_VERSION 3.3) # CACHE STRING)
- endif()
+ set(PYTHON_VERSION 3.3) # CACHE STRING)
- set_lib_path(PYTHON "python")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
- # set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS)
# Shared includes for both vc2008 and vc2010
@@ -1228,10 +1217,6 @@
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
- elseif(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
- set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
- set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2084,13 +2069,6 @@
endif()
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
- if(WITH_OPENCOLLADA)
- message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
- endif()
-endif()
-
# ensure python header is found since detection can fail, this could happen
# with _any_ library but since we used a fixed python version this tends to
# be most problematic.
Modified: branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake 2013-06-18 11:33:13 UTC (rev 57546)
@@ -751,18 +751,7 @@
endif()
endfunction()
-macro(set_lib_path
- lvar
- lproj)
- if(MSVC10)
- set(${lvar} ${LIBDIR}/${lproj}/vc2010)
- else()
- set(${lvar} ${LIBDIR}/${lproj})
- endif()
-endmacro()
-
-
macro(data_to_c
file_from file_to
list_to_add)
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt 2013-06-18 11:33:13 UTC (rev 57546)
@@ -18,7 +18,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /EHsc")
elseif(CMAKE_COMPILER_IS_GNUCC)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse")
- set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mfpmath=sse")
+ set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/SConscript
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/SConscript 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/SConscript 2013-06-18 11:33:13 UTC (rev 57546)
@@ -86,7 +86,7 @@
sse3_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
else:
sse2_cxxflags.append('-ffast-math -msse -msse2 -mfpmath=sse'.split())
- sse3_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mfpmath=sse'.split())
+ sse3_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse'.split())
defs.append('WITH_OPTIMIZED_KERNEL')
optim_defs = defs[:]
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/properties.py 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/properties.py 2013-06-18 11:33:13 UTC (rev 57546)
@@ -504,6 +504,12 @@
"objects that emit little light compared to other light sources",
default=True,
)
+ cls.use_transparent_shadow = BoolProperty(
+ name="Transparent Shadows",
+ description="Use transparent shadows for this material if it contains a Transparent BSDF"
+ "disabling will render faster but not give accurate shadows",
+ default=True,
+ )
cls.homogeneous_volume = BoolProperty(
name="Homogeneous Volume",
description="When using volume rendering, assume volume has the same density everywhere, "
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py 2013-06-18 11:33:13 UTC (rev 57546)
@@ -919,6 +919,7 @@
col = split.column()
col.prop(mat, "pass_index")
+ col.prop(cmat, "use_transparent_shadow")
layout.prop(cmat, "sample_as_light")
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_shader.cpp 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_shader.cpp 2013-06-18 11:33:13 UTC (rev 57546)
@@ -860,7 +860,8 @@
/* settings */
PointerRNA cmat = RNA_pointer_get(&b_mat->ptr, "cycles");
- shader->sample_as_light = get_boolean(cmat, "sample_as_light");
+ shader->use_mis = get_boolean(cmat, "sample_as_light");
+ shader->use_transparent_shadow = get_boolean(cmat, "use_transparent_shadow");
shader->homogeneous_volume = get_boolean(cmat, "homogeneous_volume");
shader->set_graph(graph);
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh.cpp 2013-06-18 10:09:45 UTC (rev 57545)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/bvh/bvh.cpp 2013-06-18 11:33:13 UTC (rev 57546)
@@ -552,9 +552,9 @@
{
int4 data[BVH_NODE_SIZE] =
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list