[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47154] branches/soc-2012-swiss_cheese: Last Merge was Incomplete, this should be the rest.
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue May 29 08:58:54 CEST 2012
Revision: 47154
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47154
Author: jwilkins
Date: 2012-05-29 06:58:54 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Last Merge was Incomplete, this should be the rest.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/GNUmakefile
branches/soc-2012-swiss_cheese/SConstruct
branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_lite.cmake
branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake
branches/soc-2012-swiss_cheese/build_files/scons/config/win32-mingw-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/win64-vc-config.py
branches/soc-2012-swiss_cheese/build_files/scons/tools/Blender.py
branches/soc-2012-swiss_cheese/build_files/scons/tools/btools.py
branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.types.Mesh.py
branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.render.rst
branches/soc-2012-swiss_cheese/doc/python_api/rst/include__bmesh.rst
branches/soc-2012-swiss_cheese/extern/bullet2/CMakeLists.txt
branches/soc-2012-swiss_cheese/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/soc-2012-swiss_cheese/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/soc-2012-swiss_cheese/extern/bullet2/src/SConscript
branches/soc-2012-swiss_cheese/extern/libredcode/codec.c
branches/soc-2012-swiss_cheese/intern/cycles/SConscript
branches/soc-2012-swiss_cheese/intern/cycles/app/cycles_xml.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_mesh.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_object.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_shader.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_sync.cpp
branches/soc-2012-swiss_cheese/intern/cycles/device/device_cuda.cpp
branches/soc-2012-swiss_cheese/intern/cycles/device/device_opencl.cpp
branches/soc-2012-swiss_cheese/intern/cycles/kernel/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/cycles/kernel/SConscript
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_bvh.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_object.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_projection.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_shader.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_types.h
branches/soc-2012-swiss_cheese/intern/cycles/render/graph.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/nodes.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/nodes.h
branches/soc-2012-swiss_cheese/intern/cycles/render/object.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/object.h
branches/soc-2012-swiss_cheese/intern/cycles/util/util_hash.h
branches/soc-2012-swiss_cheese/intern/cycles/util/util_thread.h
branches/soc-2012-swiss_cheese/intern/cycles/util/util_transform.h
branches/soc-2012-swiss_cheese/intern/elbeem/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2012-swiss_cheese/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2012-swiss_cheese/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2012-swiss_cheese/intern/ghost/test/multitest/Basic.c
branches/soc-2012-swiss_cheese/intern/ghost/test/multitest/EventToBuf.c
branches/soc-2012-swiss_cheese/intern/ghost/test/multitest/MultiTest.c
branches/soc-2012-swiss_cheese/intern/ghost/test/multitest/ScrollBar.c
branches/soc-2012-swiss_cheese/intern/ghost/test/multitest/Util.c
branches/soc-2012-swiss_cheese/intern/ghost/test/multitest/WindowData.c
branches/soc-2012-swiss_cheese/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2012-swiss_cheese/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2012-swiss_cheese/release/datafiles/blender_icons.png
branches/soc-2012-swiss_cheese/release/plugins/sequence/blur.c
branches/soc-2012-swiss_cheese/release/plugins/sequence/color-correction-hsv.c
branches/soc-2012-swiss_cheese/release/plugins/sequence/dnr.c
branches/soc-2012-swiss_cheese/release/plugins/sequence/gamma.c
branches/soc-2012-swiss_cheese/release/plugins/sequence/scatter.c
branches/soc-2012-swiss_cheese/release/scripts/modules/bpy/utils.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/anim.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/object.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-swiss_cheese/source/blender/collada/ArmatureExporter.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/ArmatureImporter.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/ExportSettings.h
branches/soc-2012-swiss_cheese/source/blender/collada/GeometryExporter.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/SceneExporter.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/collada.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/collada.h
branches/soc-2012-swiss_cheese/source/blender/collada/collada_internal.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/collada_internal.h
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/SConscript
branches/soc-2012-swiss_cheese/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/cineon/logImageLib.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/jp2.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2012-swiss_cheese/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2012-swiss_cheese/source/blender/quicktime/quicktime_import.h
branches/soc-2012-swiss_cheese/source/gameengine/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2012-swiss_cheese/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2012-swiss_cheese/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-swiss_cheese/source/tests/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/soc-2012-swiss_cheese/release/scripts/presets/operator/
branches/soc-2012-swiss_cheese/source/tools/codereview_upload.py
Property Changed:
----------------
branches/soc-2012-swiss_cheese/
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-swiss_cheese
___________________________________________________________________
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
/trunk/blender:46806-46823
+ /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
/trunk/blender:46806-47142
Modified: branches/soc-2012-swiss_cheese/GNUmakefile
===================================================================
--- branches/soc-2012-swiss_cheese/GNUmakefile 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/GNUmakefile 2012-05-29 06:58:54 UTC (rev 47154)
@@ -109,9 +109,12 @@
@echo
@echo Configuring Blender ...
- if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- $(CMAKE_CONFIG); \
- fi
+ # if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+ # $(CMAKE_CONFIG); \
+ # fi
+
+ # do this always incase of failed initial build, could be smarter here...
+ $(CMAKE_CONFIG)
@echo
@echo Building Blender ...
Modified: branches/soc-2012-swiss_cheese/SConstruct
===================================================================
--- branches/soc-2012-swiss_cheese/SConstruct 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/SConstruct 2012-05-29 06:58:54 UTC (rev 47154)
@@ -553,7 +553,7 @@
source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
# To ensure empty dirs are created too
- if len(source)==0:
+ if len(source)==0 and not os.path.exists(dir):
env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source))
if env['WITH_BF_CYCLES']:
Modified: branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_lite.cmake 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_lite.cmake 2012-05-29 06:58:54 UTC (rev 47154)
@@ -17,6 +17,7 @@
set(WITH_LIBMV OFF CACHE FORCE BOOL)
set(WITH_CARVE OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
+set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
Modified: branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake 2012-05-29 06:58:54 UTC (rev 47154)
@@ -1,6 +1,28 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
-
# foo_bar.spam --> foo_barMySuffix.spam
macro(file_suffix
file_name_new file_name file_suffix
Modified: branches/soc-2012-swiss_cheese/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/scons/config/win32-mingw-config.py 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/build_files/scons/config/win32-mingw-config.py 2012-05-29 06:58:54 UTC (rev 47154)
@@ -169,6 +169,11 @@
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+
##
CC = 'gcc'
CXX = 'g++'
Modified: branches/soc-2012-swiss_cheese/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/scons/config/win64-vc-config.py 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/build_files/scons/config/win64-vc-config.py 2012-05-29 06:58:54 UTC (rev 47154)
@@ -166,7 +166,8 @@
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+# No need to manually specify SSE/SSE2 on x64 systems.
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
Modified: branches/soc-2012-swiss_cheese/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/scons/tools/Blender.py 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/build_files/scons/tools/Blender.py 2012-05-29 06:58:54 UTC (rev 47154)
@@ -869,12 +869,17 @@
lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation)
if lenv['WITH_BF_PYTHON']:
- if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+ if (not lenv['WITHOUT_BF_INSTALL'] and
+ not lenv['WITHOUT_BF_PYTHON_INSTALL'] and
+ not lenv['WITHOUT_BF_PYTHON_UNPACK'] and
+ not BlenderEnvironment.PyBundleActionAdded):
lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print))
BlenderEnvironment.PyBundleActionAdded = True
elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation
if lenv['WITH_BF_PYTHON']:
- if not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+ if (not lenv['WITHOUT_BF_PYTHON_INSTALL'] and
+ not lenv['WITHOUT_BF_PYTHON_UNPACK'] and
+ not BlenderEnvironment.PyBundleActionAdded):
lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print))
BlenderEnvironment.PyBundleActionAdded = True
return prog
Modified: branches/soc-2012-swiss_cheese/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/scons/tools/btools.py 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/build_files/scons/tools/btools.py 2012-05-29 06:58:54 UTC (rev 47154)
@@ -134,7 +134,7 @@
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL',
- 'WITHOUT_BF_PYTHON_INSTALL',
+ 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
'WITHOUT_BF_OVERWRITE_INSTALL',
'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
'WITH_GHOST_COCOA',
@@ -519,6 +519,7 @@
(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
(BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
+ (BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
(BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
(BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
Modified: branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.types.Mesh.py
===================================================================
--- branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.types.Mesh.py 2012-05-29 06:31:42 UTC (rev 47153)
+++ branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.types.Mesh.py 2012-05-29 06:58:54 UTC (rev 47154)
@@ -28,7 +28,7 @@
import bpy
me = bpy.context.object.data
-uv_layer = me.uv.layers.active.data
+uv_layer = me.uv_layers.active.data
for poly in me.polygons:
print("Polygon index: %d, length: %d" % (poly.index, poly.loop_total))
Modified: branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.render.rst
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list