[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59735] branches/soc-2013-depsgraph_mt: Merging r59657 through r59734 from trunk into soc-2013-depsgraph_mt

Sergey Sharybin sergey.vfx at gmail.com
Mon Sep 2 16:01:52 CEST 2013


Revision: 59735
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59735
Author:   nazgul
Date:     2013-09-02 14:01:52 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Merging r59657 through r59734 from trunk into soc-2013-depsgraph_mt

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59657
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59734

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/atomic/atomic_ops.h
    branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/SConscript
    branches/soc-2013-depsgraph_mt/intern/cycles/app/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/app/cycles_standalone.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/app/cycles_xml.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_sync.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/cmake/external_libs.cmake
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_cpu.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_memory.h
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_multi.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_network.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_network.h
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_task.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/device/device_task.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.cl
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.cu
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_film.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_sse2.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/buffers.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/buffers.h
    branches/soc-2013-depsgraph_mt/intern/cycles/render/image.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/integrator.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/nodes.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/session.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/render/session.h
    branches/soc-2013-depsgraph_mt/intern/cycles/render/sky_model.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/util/CMakeLists.txt
    branches/soc-2013-depsgraph_mt/intern/cycles/util/util_task.cpp
    branches/soc-2013-depsgraph_mt/intern/cycles/util/util_task.h
    branches/soc-2013-depsgraph_mt/intern/cycles/util/util_types.h
    branches/soc-2013-depsgraph_mt/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mallocn.c
    branches/soc-2013-depsgraph_mt/intern/guardedalloc/intern/mmap_win.c
    branches/soc-2013-depsgraph_mt/intern/guardedalloc/mmap_win.h
    branches/soc-2013-depsgraph_mt/intern/opencolorio/fallback_impl.cc
    branches/soc-2013-depsgraph_mt/intern/opencolorio/ocio_capi.cc
    branches/soc-2013-depsgraph_mt/intern/opencolorio/ocio_capi.h
    branches/soc-2013-depsgraph_mt/intern/opencolorio/ocio_impl.h
    branches/soc-2013-depsgraph_mt/intern/opencolorio/ocio_impl_glsl.cc
    branches/soc-2013-depsgraph_mt/release/scripts/presets/keyconfig/maya.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-depsgraph_mt/source/blender/blenfont/intern/blf_font.c
    branches/soc-2013-depsgraph_mt/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2013-depsgraph_mt/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_editmesh_bvh.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_lamp.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_library.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_object.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_report.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_text.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/boids.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/image.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/text.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_dynstr.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_endian_switch.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_ghash.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_jitter.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_kdtree.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_lasso.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_linklist_stack.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_memarena.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_mempool.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_path_util.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_smallhash.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_string.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_string_utf8.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_memarena.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/edgehash.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/gsqueue.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/lasso.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/path_util.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/quadric.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/rand.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/scanfill.c
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-depsgraph_mt/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_inline.h
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.h
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bisect_plane.c
    branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_edgenet.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_object.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_bisect.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_relations.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/physics/particle_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/screen/glutil.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_view.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_draw.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_project.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.c
    branches/soc-2013-depsgraph_mt/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/jpeg.c
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_ipo_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_object_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/intern/SConscript
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/RNA_access.h
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/RNA_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_color.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_render.c
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_composite.h
    branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_shader.h
    branches/soc-2013-depsgraph_mt/source/blender/nodes/NOD_texture.h
    branches/soc-2013-depsgraph_mt/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/zbuf.c
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_api.h
    branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_types.h

Added Paths:
-----------
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_compiler_attrs.h
    branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_strict_flags.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_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-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59656
   + /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-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59734

Modified: branches/soc-2013-depsgraph_mt/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/CMakeLists.txt	2013-09-02 14:01:52 UTC (rev 59735)
@@ -262,6 +262,7 @@
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_STANDALONE		"Build cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI	"Build cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
 set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
@@ -881,8 +882,6 @@
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		if(NOT WITH_PYTHON_MODULE)
-			# BSD's dont use libdl.so
-		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
 			# binreloc is linux only
 			set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
 			set(WITH_BINRELOC ON)

Modified: branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/build_files/cmake/macros.cmake	2013-09-02 14:01:52 UTC (rev 59735)
@@ -387,7 +387,7 @@
 		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
 	endif()
 
-	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+	target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
 endmacro()
 
 macro(TEST_SSE_SUPPORT

Modified: branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h	2013-09-02 14:01:52 UTC (rev 59735)
@@ -91,13 +91,13 @@
 ATOMIC_INLINE uint64_t
 atomic_add_uint64(uint64_t *p, uint64_t x)
 {
-	return (OSAtomicAdd64((int64_t)x, (int64_t *)p));
+	return (uint64_t)(OSAtomicAdd64((int64_t)x, (int64_t *)p));
 }
 
 ATOMIC_INLINE uint64_t
 atomic_sub_uint64(uint64_t *p, uint64_t x)
 {
-	return (OSAtomicAdd64(-((int64_t)x), (int64_t *)p));
+	return (uint64_t)(OSAtomicAdd64(-((int64_t)x), (int64_t *)p));
 }
 #  elif (defined(__amd64__) || defined(__x86_64__))
 ATOMIC_INLINE uint64_t
@@ -189,13 +189,13 @@
 ATOMIC_INLINE uint32_t
 atomic_add_uint32(uint32_t *p, uint32_t x)
 {
-	return (OSAtomicAdd32((int32_t)x, (int32_t *)p));
+	return (uint32_t)(OSAtomicAdd32((int32_t)x, (int32_t *)p));
 }
 
 ATOMIC_INLINE uint32_t
 atomic_sub_uint32(uint32_t *p, uint32_t x)
 {
-	return (OSAtomicAdd32(-((int32_t)x), (int32_t *)p));
+	return (uint32_t)(OSAtomicAdd32(-((int32_t)x), (int32_t *)p));
 }
 #elif (defined(__i386__) || defined(__amd64__) || defined(__x86_64__))
 ATOMIC_INLINE uint32_t

Modified: branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt	2013-09-02 14:01:52 UTC (rev 59735)
@@ -14,8 +14,13 @@
 
 if(WIN32 AND MSVC)
 	# there is no /arch:SSE3, but intrinsics are available anyway
-	set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
-	set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+	if(CMAKE_CL_64)
+		set(CYCLES_SSE2_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+		set(CYCLES_SSE3_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+	else()
+		set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+		set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+	endif()
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")

Modified: branches/soc-2013-depsgraph_mt/intern/cycles/SConscript
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/SConscript	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/SConscript	2013-09-02 14:01:52 UTC (rev 59735)
@@ -57,7 +57,7 @@
     incs.append(cycles['BF_OSL_INC'])
 
 incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
-incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())
+incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna #source/blender/blenlib'.split())
 incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
 incs.extend('#extern/glew/include #intern/mikktspace'.split())
 incs.append(cycles['BF_OIIO_INC'])

Modified: branches/soc-2013-depsgraph_mt/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/app/CMakeLists.txt	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/app/CMakeLists.txt	2013-09-02 14:01:52 UTC (rev 59735)
@@ -20,14 +20,23 @@
 	cycles_subd
 	cycles_util
 	${BOOST_LIBRARIES}
+	${OPENEXR_LIBRARIES}
 	${OPENGL_LIBRARIES}
 	${CYCLES_GLEW_LIBRARY}
 	${OPENIMAGEIO_LIBRARIES}
+	${PNG_LIBRARIES}
+	${JPEG_LIBRARIES}
+	${ZLIB_LIBRARIES}
+	${TIFF_LIBRARY}
 )
 
-link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH})
+if(WIN32)
+	list(APPEND LIBRARIES ${PTHREADS_LIBRARIES})
+endif()
 
-if(WITH_CYCLES_STANDALONE)
+link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH} ${PNG_LIBPATH} ${JPEG_LIBPATH} ${ZLIB_LIBPATH} ${TIFF_LIBPATH})
+
+if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
 	list(APPEND LIBRARIES ${GLUT_LIBRARIES})
 endif()
 
@@ -45,7 +54,7 @@
 		cycles_xml.h
 	)
 	add_executable(cycles ${SRC})
-	target_link_libraries(cycles ${LIBRARIES})
+	target_link_libraries(cycles ${LIBRARIES} ${CMAKE_DL_LIBS})
 
 	if(UNIX AND NOT APPLE)
 		set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib)

Modified: branches/soc-2013-depsgraph_mt/intern/cycles/app/cycles_standalone.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/app/cycles_standalone.cpp	2013-09-02 13:54:12 UTC (rev 59734)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/app/cycles_standalone.cpp	2013-09-02 14:01:52 UTC (rev 59735)
@@ -29,7 +29,10 @@
 #include "util_progress.h"
 #include "util_string.h"
 #include "util_time.h"
+
+#ifdef WITH_CYCLES_STANDALONE_GUI
 #include "util_view.h"
+#endif
 
 #include "cycles_xml.h"
 
@@ -100,8 +103,10 @@
 	
 	if(options.session_params.background && !options.quiet)
 		options.session->progress.set_update_callback(function_bind(&session_print_status));
+#ifdef WITH_CYCLES_STANDALONE_GUI
 	else
 		options.session->progress.set_update_callback(function_bind(&view_redraw));
+#endif
 
 	options.session->start();
 
@@ -136,6 +141,7 @@
 	}
 }
 
+#ifdef WITH_CYCLES_STANDALONE_GUI
 static void display_info(Progress& progress)
 {
 	static double latency = 0.0;
@@ -186,6 +192,7 @@
 	else if(key == 27) // escape
 		options.session->progress.set_cancel("Cancelled");
 }
+#endif
 
 static int files_parse(int argc, const char *argv[])
 {
@@ -271,8 +278,14 @@
 	else if(ssname == "svm")
 		options.scene_params.shadingsystem = SceneParams::SVM;
 		
-	/* Progressive rendering */
-	options.session_params.progressive = true;
+#ifdef WITH_CYCLES_STANDALONE_GUI
+	/* Progressive rendering for GUI */
+	if(!options.session_params.background)
+		options.session_params.progressive = true;
+#else
+	/* When building without GUI, set background */
+	options.session_params.background = true;
+#endif
 
 	/* find matching device */
 	DeviceType device_type = Device::type_from_string(devicename.c_str());
@@ -325,13 +338,15 @@
 int main(int argc, const char **argv)
 {
 	path_init();
-
 	options_parse(argc, argv);
-
+	
+#ifdef WITH_CYCLES_STANDALONE_GUI
 	if(options.session_params.background) {
+#endif
 		session_init();
 		options.session->wait();
 		session_exit();
+#ifdef WITH_CYCLES_STANDALONE_GUI
 	}
 	else {
 		string title = "Cycles: " + path_filename(options.filepath);
@@ -340,6 +355,7 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list