[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42602] branches/soc-2011-tomato: Merging r42533 through r42601 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Tue Dec 13 12:59:07 CET 2011


Revision: 42602
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42602
Author:   nazgul
Date:     2011-12-13 11:58:59 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Merging r42533 through r42601 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/SConstruct
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
    branches/soc-2011-tomato/doc/manpage/blender.1
    branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
    branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackDevice.h
    branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-tomato/intern/cycles/device/device.h
    branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-tomato/intern/cycles/device/device_multi.cpp
    branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-tomato/intern/cycles/render/session.cpp
    branches/soc-2011-tomato/intern/cycles/render/session.h
    branches/soc-2011-tomato/intern/cycles/util/util_transform.h
    branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_fileops.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/object/object_add.c
    branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/util/undo.c
    branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2011-tomato/source/blender/python/intern/gpu.c
    branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.cpp

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42532
   + /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42601

Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/SConstruct	2011-12-13 11:58:59 UTC (rev 42602)
@@ -272,7 +272,7 @@
         if k not in B.arguments:
             env[k] = v
 
-# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
 if env['OURPLATFORM']=='darwin':
     print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
     print "Available " + env['MACOSX_SDK_CHECK']
@@ -291,6 +291,16 @@
         else:
             env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
 
+    # for now, Mac builders must download and install the JackOSX framework 
+    # necessary header file lives here when installed:
+    # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
+    if env['WITH_BF_JACK'] == 1:
+        if not os.path.exists('/Library/Frameworks/Jackmp.framework'):
+            print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
+            env['WITH_BF_JACK'] = 0
+        else:
+            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                 env['CCFLAGS'].append('/openmp')

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-12-13 11:58:59 UTC (rev 42602)
@@ -96,6 +96,7 @@
 
 # Cycles
 WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py	2011-12-13 11:58:59 UTC (rev 42602)
@@ -95,5 +95,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2']  # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-12-13 11:58:59 UTC (rev 42602)
@@ -96,6 +96,7 @@
 
 # Cycles
 WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True
@@ -116,5 +117,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2']  # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2011-12-13 11:58:59 UTC (rev 42602)
@@ -148,12 +148,12 @@
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
-# TODO - set proper paths here (add precompiled to lib/ ? )
-WITH_BF_JACK = False
-BF_JACK = '/usr'
-BF_JACK_INC = '${BF_JACK}/include/jack'
+# we use simply jack framework
+WITH_BF_JACK = True
+BF_JACK = '/Library/Frameworks/Jackmp.framework'
+BF_JACK_INC = '${BF_JACK}/headers'
 BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
+BF_JACK_LIBPATH = '${BF_JACK}'
 
 WITH_BF_SNDFILE = True
 BF_SNDFILE = LIBDIR + '/sndfile'

Modified: branches/soc-2011-tomato/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/libmv/CMakeLists.txt	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/extern/libmv/CMakeLists.txt	2011-12-13 11:58:59 UTC (rev 42602)
@@ -148,23 +148,23 @@
 		third_party/glog/src/vlog_is_on.cc
 		third_party/glog/src/windows/port.cc
 
-		third_party/glog/src/utilities.h
+		third_party/glog/src/config.h
+		third_party/glog/src/stacktrace.h
 		third_party/glog/src/stacktrace_generic-inl.h
-		third_party/glog/src/stacktrace.h
+		third_party/glog/src/stacktrace_libunwind-inl.h
+		third_party/glog/src/stacktrace_powerpc-inl.h
+		third_party/glog/src/stacktrace_x86-inl.h
 		third_party/glog/src/stacktrace_x86_64-inl.h
+		third_party/glog/src/utilities.h
+		third_party/glog/src/base/commandlineflags.h
 		third_party/glog/src/base/googleinit.h
 		third_party/glog/src/base/mutex.h
-		third_party/glog/src/base/commandlineflags.h
-		third_party/glog/src/stacktrace_powerpc-inl.h
-		third_party/glog/src/stacktrace_x86-inl.h
-		third_party/glog/src/config.h
-		third_party/glog/src/stacktrace_libunwind-inl.h
+		third_party/glog/src/windows/config.h
+		third_party/glog/src/windows/port.h
+		third_party/glog/src/windows/glog/log_severity.h
+		third_party/glog/src/windows/glog/logging.h
 		third_party/glog/src/windows/glog/raw_logging.h
 		third_party/glog/src/windows/glog/vlog_is_on.h
-		third_party/glog/src/windows/glog/logging.h
-		third_party/glog/src/windows/glog/log_severity.h
-		third_party/glog/src/windows/port.h
-		third_party/glog/src/windows/config.h
 	)
 
 	list(APPEND INC
@@ -184,7 +184,7 @@
 			string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 		endforeach()
 	endif()
-else(WIN32)
+else()
 	list(APPEND SRC
 		third_party/glog/src/utilities.cc
 		third_party/glog/src/symbolize.cc
@@ -194,25 +194,26 @@
 		third_party/glog/src/demangle.cc
 		third_party/glog/src/raw_logging.cc
 
-		third_party/glog/src/utilities.h
-		third_party/glog/src/stacktrace_generic-inl.h
+		third_party/glog/src/config.h
+		third_party/glog/src/config_freebsd.h
+		third_party/glog/src/config_linux.h
 		third_party/glog/src/config_mac.h
+		third_party/glog/src/demangle.h
 		third_party/glog/src/stacktrace.h
+		third_party/glog/src/stacktrace_generic-inl.h
+		third_party/glog/src/stacktrace_libunwind-inl.h
+		third_party/glog/src/stacktrace_powerpc-inl.h
+		third_party/glog/src/stacktrace_x86-inl.h
 		third_party/glog/src/stacktrace_x86_64-inl.h
 		third_party/glog/src/symbolize.h
+		third_party/glog/src/utilities.h
+		third_party/glog/src/base/commandlineflags.h
 		third_party/glog/src/base/googleinit.h
 		third_party/glog/src/base/mutex.h
-		third_party/glog/src/base/commandlineflags.h
-		third_party/glog/src/stacktrace_powerpc-inl.h
-		third_party/glog/src/stacktrace_x86-inl.h
-		third_party/glog/src/config.h
-		third_party/glog/src/demangle.h
-		third_party/glog/src/stacktrace_libunwind-inl.h
+		third_party/glog/src/glog/log_severity.h
+		third_party/glog/src/glog/logging.h
 		third_party/glog/src/glog/raw_logging.h
 		third_party/glog/src/glog/vlog_is_on.h
-		third_party/glog/src/glog/logging.h
-		third_party/glog/src/glog/log_severity.h
-		third_party/glog/src/config_linux.h
 	)
 
 	list(APPEND INC
@@ -220,6 +221,9 @@
 	)
 endif()
 
-add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
+add_definitions(
+	-DV3DLIB_ENABLE_SUITESPARSE
+	-DGOOGLE_GLOG_DLL_DECL=
+)
 
 blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackDevice.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackDevice.h	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackDevice.h	2011-12-13 11:58:59 UTC (rev 42602)
@@ -36,6 +36,10 @@
 
 #include <string>
 
+#if defined(__APPLE__) // always first include for jack weaklinking !
+#include <weakjack.h>
+#endif
+
 #include <jack.h>
 #include <ringbuffer.h>
 

Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp	2011-12-13 10:17:17 UTC (rev 42601)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp	2011-12-13 11:58:59 UTC (rev 42602)
@@ -257,7 +257,7 @@
 	PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
 
 	/* feature set */
-	bool experimental = (RNA_enum_get(&cscene, "feature_set") != 0);
+	params.experimental = (RNA_enum_get(&cscene, "feature_set") != 0);
 
 	/* device type */
 	params.device_type = DEVICE_CPU;
@@ -266,14 +266,14 @@
 		vector<DeviceType> types = Device::available_types();
 		DeviceType dtype;
 		
-		if(!experimental || RNA_enum_get(&cscene, "gpu_type") == 0)
+		if(!params.experimental || RNA_enum_get(&cscene, "gpu_type") == 0)
 			dtype = DEVICE_CUDA;
 		else
 			dtype = DEVICE_OPENCL;
 
 		if(device_type_available(types, dtype))
 			params.device_type = dtype;
-		else if(experimental && device_type_available(types, DEVICE_OPENCL))
+		else if(params.experimental && device_type_available(types, DEVICE_OPENCL))
 			params.device_type = DEVICE_OPENCL;
 		else if(device_type_available(types, DEVICE_CUDA))
 			params.device_type = DEVICE_CUDA;

Modified: branches/soc-2011-tomato/intern/cycles/device/device.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/device/device.h	2011-12-13 10:17:17 UTC (rev 42601)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list