Revision: 37387
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37387
Author: jwilkins
Date: 2011-06-10 21:05:19 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
Merged with trunk: 37207-37386
D:\gsoc\soc-2011-onion>svn merge
^https://svn.blender.org/svnroot/bf-blender/trunk/blender --non-interactive
--- Merging r37207 through r37384 into '.':
D:\gsoc\soc-2011-onion>svn merge
^https://svn.blender.org/svnroot/bf-blender/trunk/blender --non-interactive
--- Merging r37385 through r37386 into '.':
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37207
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37384
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37385
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37386
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/GNUmakefile
branches/soc-2011-onion/SConstruct
branches/soc-2011-onion/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion/build_files/scons/tools/Blender.py
branches/soc-2011-onion/release/scripts/modules/console/complete_namespace.py
branches/soc-2011-onion/release/scripts/modules/console/intellisense.py
branches/soc-2011-onion/release/scripts/modules/console_python.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-onion/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-onion/source/blender/blenkernel/BKE_multires.h
branches/soc-2011-onion/source/blender/blenkernel/intern/blender.c
branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-onion/source/blender/blenkernel/intern/deform.c
branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c
branches/soc-2011-onion/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-onion/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-onion/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2011-onion/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/collada/EffectExporter.cpp
branches/soc-2011-onion/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-onion/source/blender/editors/animation/anim_markers.c
branches/soc-2011-onion/source/blender/editors/animation/anim_ops.c
branches/soc-2011-onion/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-onion/source/blender/editors/include/ED_mesh.h
branches/soc-2011-onion/source/blender/editors/include/ED_screen.h
branches/soc-2011-onion/source/blender/editors/include/ED_view3d.h
branches/soc-2011-onion/source/blender/editors/include/UI_interface_icons.h
branches/soc-2011-onion/source/blender/editors/interface/interface.c
branches/soc-2011-onion/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion/source/blender/editors/interface/interface_intern.h
branches/soc-2011-onion/source/blender/editors/interface/interface_layout.c
branches/soc-2011-onion/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion/source/blender/editors/interface/resources.c
branches/soc-2011-onion/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-onion/source/blender/editors/object/object_bake.c
branches/soc-2011-onion/source/blender/editors/object/object_modifier.c
branches/soc-2011-onion/source/blender/editors/object/object_shapekey.c
branches/soc-2011-onion/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion/source/blender/editors/render/render_view.c
branches/soc-2011-onion/source/blender/editors/screen/area.c
branches/soc-2011-onion/source/blender/editors/screen/screen_edit.c
branches/soc-2011-onion/source/blender/editors/screen/screen_ops.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion/source/blender/editors/space_action/action_select.c
branches/soc-2011-onion/source/blender/editors/space_file/file_draw.c
branches/soc-2011-onion/source/blender/editors/space_file/file_ops.c
branches/soc-2011-onion/source/blender/editors/space_file/filesel.c
branches/soc-2011-onion/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-onion/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-onion/source/blender/editors/space_image/image_ops.c
branches/soc-2011-onion/source/blender/editors/space_info/info_report.c
branches/soc-2011-onion/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2011-onion/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-onion/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion/source/blender/editors/space_node/node_select.c
branches/soc-2011-onion/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-onion/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-onion/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-onion/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-onion/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-onion/source/blender/editors/transform/transform.c
branches/soc-2011-onion/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-onion/source/blender/editors/util/undo.c
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-onion/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion/source/blender/imbuf/intern/filter.c
branches/soc-2011-onion/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-onion/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion/source/blender/makesrna/RNA_access.h
branches/soc-2011-onion/source/blender/makesrna/RNA_define.h
branches/soc-2011-onion/source/blender/makesrna/RNA_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-onion/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2011-onion/source/blender/nodes/intern/CMP_util.c
branches/soc-2011-onion/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-onion/source/blender/python/intern/bpy_props.c
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.h
branches/soc-2011-onion/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-onion/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion/source/blender/render/intern/source/rendercore.c
branches/soc-2011-onion/source/blender/render/intern/source/sunsky.c
branches/soc-2011-onion/source/blender/render/intern/source/volumetric.c
branches/soc-2011-onion/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-onion/source/blender/windowmanager/WM_api.h
branches/soc-2011-onion/source/blender/windowmanager/WM_types.h
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion/source/creator/SConscript
branches/soc-2011-onion/source/creator/creator.c
branches/soc-2011-onion/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-onion/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-onion/source/tests/CMakeLists.txt
branches/soc-2011-onion/source/tests/bl_load_py_modules.py
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/trunk/blender:36833-37206
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/trunk/blender:36833-37386
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-06-10 20:59:48 UTC (rev
37386)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-06-10 21:05:19 UTC (rev
37387)
@@ -189,6 +189,9 @@
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
endif()
+#-----------------------------------------------------------------------------
+# Check for conflicting/unsupported configurations
+
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -210,6 +213,12 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to
be OFF")
endif()
+if(WITH_CODEC_QUICKTIME AND MINGW)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently
unsupported, remove this "
+ "line if youre a developer who
wants to add support.")
+endif()
+
# may as well build python module without a UI
if(WITH_PYTHON_MODULE)
set(WITH_HEADLESS ON)
@@ -1037,7 +1046,7 @@
#-----------------------------------------------------------------------------
# Configure OpenGL.
find_package(OpenGL)
-blender_include_dirs("${OPENGL_INCLUDE_DIR}")
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
# unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake
# unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
Modified: branches/soc-2011-onion/GNUmakefile
===================================================================
--- branches/soc-2011-onion/GNUmakefile 2011-06-10 20:59:48 UTC (rev 37386)
+++ branches/soc-2011-onion/GNUmakefile 2011-06-10 21:05:19 UTC (rev 37387)
@@ -64,21 +64,19 @@
# Build Blender
all:
- @echo
+ @echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- mkdir -p $(BUILD_DIR) ; \
- cd $(BUILD_DIR) ; \
- cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+ cmake -H$(BLENDER_DIR) -B$(BUILD_DIR)
-DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
fi
- @echo
+ @echo
@echo Building Blender ...
- cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
- @echo
+ make -C $(BUILD_DIR) -s -j $(NPROCS) install
+ @echo
@echo run blender from "$(BUILD_DIR)/bin/blender"
- @echo
+ @echo
debug: all
# pass
@@ -91,7 +89,7 @@
cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg
--asroot
package_archive:
- cd $(BUILD_DIR) ; make -s package_archive
+ make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release"
# forward build targets
@@ -109,6 +107,6 @@
@echo "written: test_cmake_consistency.log"
clean:
- cd $(BUILD_DIR) ; make clean
+ make -C $(BUILD_DIR) clean
.PHONY: all
Modified: branches/soc-2011-onion/SConstruct
===================================================================
--- branches/soc-2011-onion/SConstruct 2011-06-10 20:59:48 UTC (rev 37386)
+++ branches/soc-2011-onion/SConstruct 2011-06-10 21:05:19 UTC (rev 37387)
@@ -306,10 +306,6 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
-if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc',
'win32-ming', 'win64-vc'):
- env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup')
- env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
-
# lastly we check for root_build_dir ( we should not do before, otherwise we
might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
@@ -409,17 +405,18 @@
B.propose_priorities()
dobj = B.buildinfo(env, "dynamic") + B.resources
+creob = B.creator(env)
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
- env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs +
dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+ env.BlenderProg(B.root_build_dir, "blender", creob + mainlist +
thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs,
'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
playerlist += B.create_blender_liblist(env, 'player2')
playerlist += B.create_blender_liblist(env, 'intern')
playerlist += B.create_blender_liblist(env, 'extern')
- env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist +
thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs,
'blenderplayer')
+ env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist +
thestatlibs, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs,
'blenderplayer')
##### Now define some targets
Modified:
branches/soc-2011-onion/build_files/cmake/example_scripts/cmake_linux_install.sh
===================================================================
---
branches/soc-2011-onion/build_files/cmake/example_scripts/cmake_linux_install.sh
2011-06-10 20:59:48 UTC (rev 37386)
+++
branches/soc-2011-onion/build_files/cmake/example_scripts/cmake_linux_install.sh
2011-06-10 21:05:19 UTC (rev 37387)
@@ -17,7 +17,7 @@
# cmake without copying files for fast rebuilds
# the files from svn will be used in place
-cmake ../blender -DWITH_INSTALL:BOOL=FALSE
+cmake ../blender
# make blender, will take some time
make
Modified: branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
2011-06-10 20:59:48 UTC (rev 37386)
+++ branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
2011-06-10 21:05:19 UTC (rev 37387)
@@ -35,7 +35,7 @@
WITH_BF_JACK = False
BF_JACK = LIBDIR + '/jack'
-BF_JACK_INC = '${BF_JACK}/include'
+BF_JACK_INC = '${BF_JACK}/include ${BF_FFMPEG}/include/msvc'
BF_JACK_LIB = 'libjack'
BF_JACK_LIBPATH = '${BF_JACK}/lib'
Modified: branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
2011-06-10 20:59:48 UTC (rev 37386)
+++ branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
2011-06-10 21:05:19 UTC (rev 37387)
@@ -173,7 +173,7 @@
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
-BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC',
'-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
Modified: branches/soc-2011-onion/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/tools/Blender.py 2011-06-10
20:59:48 UTC (rev 37386)
+++ branches/soc-2011-onion/build_files/scons/tools/Blender.py 2011-06-10
21:05:19 UTC (rev 37387)
@@ -258,7 +258,10 @@
syslibs += Split(lenv['BF_PTHREADS_LIB'])
if lenv['WITH_BF_COLLADA']:
syslibs.append(lenv['BF_PCRE_LIB'])
- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
+ if lenv['BF_DEBUG']:
+ syslibs += [colladalib+'_d' for colladalib in
Split(lenv['BF_OPENCOLLADA_LIB'])]
+ else:
+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
syslibs.append(lenv['BF_EXPAT_LIB'])
if not lenv['WITH_BF_STATICLIBSAMPLERATE']:
@@ -287,6 +290,50 @@
print "\t\t",new_priority, v
new_priority += 5
+# emits the necessary file objects for creator.c, to be used in creating
+# the final blender executable
+def creator(env):
+ sources = ['creator.c']# + Blender.buildinfo(env, "dynamic") +
Blender.resources
+
+ incs = ['#/intern/guardedalloc', '#/source/blender/blenlib',
'#/source/blender/blenkernel', '#/source/blender/editors/include',
'#/source/blender/blenloader', '#/source/blender/imbuf',
'#/source/blender/renderconverter', '#/source/blender/render/extern/include',
'#/source/blender/windowmanager', '#/source/blender/makesdna',
'#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines',
'#/extern/glew/include', '#/source/blender/gpu', env['BF_OPENGL_INC']]
+
+ defs = []
+ if env['WITH_BF_QUICKTIME']:
+ incs.append(env['BF_QUICKTIME_INC'])
+ defs.append('WITH_QUICKTIME')
+
+ if env['WITH_BF_BINRELOC']:
+ incs.append('#/extern/binreloc/include')
+ defs.append('WITH_BINRELOC')
+
+ if env['WITH_BF_OPENEXR']:
+ defs.append('WITH_OPENEXR')
+
+ if env['WITH_BF_TIFF']:
+ defs.append('WITH_TIFF')
+
+ if not env['WITH_BF_SDL']:
+ defs.append('DISABLE_SDL')
+
+ if env['WITH_BF_PYTHON']:
+ incs.append('#/source/blender/python')
+ defs.append('WITH_PYTHON')
+ if env['BF_DEBUG']:
+ defs.append('_DEBUG')
+
+ if env['BF_BUILDINFO']:
+ defs.append('BUILD_DATE')
+ defs.append('NAN_BUILDINFO')
+
+ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross',
'win64-vc'):
+ incs.append(env['BF_PTHREADS_INC'])
+
+ env.Append(CPPDEFINES=defs)
+ env.Append(CPPPATH=incs)
+ obj = [env.Object(root_build_dir+'source/creator/creator/creator',
['#source/creator/creator.c'])]
+
+ return obj
+
## TODO: see if this can be made in an emitter
def buildinfo(lenv, build_type):
"""
@@ -324,7 +371,7 @@
lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])
- obj = [lenv.Object
(root_build_dir+'source/creator/%s_buildinfo'%build_type,
[root_build_dir+'source/creator/buildinfo.c'])]
+ obj = [lenv.Object
(root_build_dir+'source/creator/%s_buildinfo'%build_type,
['#source/creator/buildinfo.c'])]
return obj
@@ -714,23 +761,19 @@
global vcp
print bc.HEADER+'Configuring program
'+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
lenv = self.Clone()
+ lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
