[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25316] branches/sculpt25: Sculpt Branch:
Brecht Van Lommel
brecht at blender.org
Fri Dec 11 15:38:03 CET 2009
Revision: 25316
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25316
Author: blendix
Date: 2009-12-11 15:38:02 +0100 (Fri, 11 Dec 2009)
Log Message:
-----------
Sculpt Branch:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25245:25315
Modified Paths:
--------------
branches/sculpt25/config/darwin-config.py
branches/sculpt25/config/linux2-config.py
branches/sculpt25/config/win32-mingw-config.py
branches/sculpt25/config/win32-vc-config.py
branches/sculpt25/config/win64-vc-config.py
branches/sculpt25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/sculpt25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/sculpt25/projectfiles_vc9/blender/loader/BLO_loader.vcproj
branches/sculpt25/release/scripts/io/export_fbx.py
branches/sculpt25/release/scripts/io/export_mdd.py
branches/sculpt25/release/scripts/io/netrender/balancing.py
branches/sculpt25/release/scripts/io/netrender/client.py
branches/sculpt25/release/scripts/io/netrender/master.py
branches/sculpt25/release/scripts/io/netrender/master_html.py
branches/sculpt25/release/scripts/io/netrender/model.py
branches/sculpt25/release/scripts/io/netrender/ui.py
branches/sculpt25/release/scripts/modules/bpy/utils.py
branches/sculpt25/release/scripts/modules/bpy_types.py
branches/sculpt25/release/scripts/modules/graphviz_export.py
branches/sculpt25/release/scripts/modules/rigify/__init__.py
branches/sculpt25/release/scripts/modules/rigify/delta.py
branches/sculpt25/release/scripts/modules/rna_prop_ui.py
branches/sculpt25/release/scripts/op/add_mesh_torus.py
branches/sculpt25/release/scripts/op/wm.py
branches/sculpt25/release/scripts/ui/properties_data_armature.py
branches/sculpt25/release/scripts/ui/properties_data_bone.py
branches/sculpt25/release/scripts/ui/properties_data_mesh.py
branches/sculpt25/release/scripts/ui/properties_material.py
branches/sculpt25/release/scripts/ui/properties_object.py
branches/sculpt25/release/scripts/ui/properties_object_constraint.py
branches/sculpt25/release/scripts/ui/properties_particle.py
branches/sculpt25/release/scripts/ui/properties_physics_common.py
branches/sculpt25/release/scripts/ui/properties_physics_fluid.py
branches/sculpt25/release/scripts/ui/properties_render.py
branches/sculpt25/release/scripts/ui/properties_scene.py
branches/sculpt25/release/scripts/ui/properties_texture.py
branches/sculpt25/release/scripts/ui/space_dopesheet.py
branches/sculpt25/release/scripts/ui/space_filebrowser.py
branches/sculpt25/release/scripts/ui/space_graph.py
branches/sculpt25/release/scripts/ui/space_image.py
branches/sculpt25/release/scripts/ui/space_info.py
branches/sculpt25/release/scripts/ui/space_logic.py
branches/sculpt25/release/scripts/ui/space_nla.py
branches/sculpt25/release/scripts/ui/space_node.py
branches/sculpt25/release/scripts/ui/space_outliner.py
branches/sculpt25/release/scripts/ui/space_sequencer.py
branches/sculpt25/release/scripts/ui/space_text.py
branches/sculpt25/release/scripts/ui/space_time.py
branches/sculpt25/release/scripts/ui/space_userpref.py
branches/sculpt25/release/scripts/ui/space_view3d.py
branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py
branches/sculpt25/source/Makefile
branches/sculpt25/source/blender/blenkernel/BKE_scene.h
branches/sculpt25/source/blender/blenkernel/BKE_sequence.h
branches/sculpt25/source/blender/blenkernel/intern/cloth.c
branches/sculpt25/source/blender/blenkernel/intern/scene.c
branches/sculpt25/source/blender/blenkernel/intern/seqeffects.c
branches/sculpt25/source/blender/blenkernel/intern/sequence.c
branches/sculpt25/source/blender/blenloader/intern/readfile.c
branches/sculpt25/source/blender/editors/animation/anim_ops.c
branches/sculpt25/source/blender/editors/animation/fmodifier_ui.c
branches/sculpt25/source/blender/editors/animation/keyframes_draw.c
branches/sculpt25/source/blender/editors/animation/keyframing.c
branches/sculpt25/source/blender/editors/armature/armature_ops.c
branches/sculpt25/source/blender/editors/curve/curve_ops.c
branches/sculpt25/source/blender/editors/curve/editcurve.c
branches/sculpt25/source/blender/editors/datafiles/B.blend.c
branches/sculpt25/source/blender/editors/gpencil/gpencil_buttons.c
branches/sculpt25/source/blender/editors/gpencil/gpencil_edit.c
branches/sculpt25/source/blender/editors/include/ED_keyframing.h
branches/sculpt25/source/blender/editors/include/UI_icons.h
branches/sculpt25/source/blender/editors/include/UI_interface.h
branches/sculpt25/source/blender/editors/interface/interface_handlers.c
branches/sculpt25/source/blender/editors/interface/interface_icons.c
branches/sculpt25/source/blender/editors/interface/interface_layout.c
branches/sculpt25/source/blender/editors/interface/interface_regions.c
branches/sculpt25/source/blender/editors/interface/interface_templates.c
branches/sculpt25/source/blender/editors/interface/interface_utils.c
branches/sculpt25/source/blender/editors/interface/resources.c
branches/sculpt25/source/blender/editors/mesh/editmesh_mods.c
branches/sculpt25/source/blender/editors/mesh/editmesh_tools.c
branches/sculpt25/source/blender/editors/mesh/mesh_ops.c
branches/sculpt25/source/blender/editors/metaball/mball_edit.c
branches/sculpt25/source/blender/editors/object/object_ops.c
branches/sculpt25/source/blender/editors/object/object_select.c
branches/sculpt25/source/blender/editors/render/render_shading.c
branches/sculpt25/source/blender/editors/screen/screen_edit.c
branches/sculpt25/source/blender/editors/screen/screen_ops.c
branches/sculpt25/source/blender/editors/space_action/action_edit.c
branches/sculpt25/source/blender/editors/space_action/space_action.c
branches/sculpt25/source/blender/editors/space_buttons/buttons_context.c
branches/sculpt25/source/blender/editors/space_buttons/space_buttons.c
branches/sculpt25/source/blender/editors/space_graph/graph_buttons.c
branches/sculpt25/source/blender/editors/space_graph/graph_edit.c
branches/sculpt25/source/blender/editors/space_graph/space_graph.c
branches/sculpt25/source/blender/editors/space_image/image_buttons.c
branches/sculpt25/source/blender/editors/space_logic/space_logic.c
branches/sculpt25/source/blender/editors/space_nla/nla_edit.c
branches/sculpt25/source/blender/editors/space_nla/space_nla.c
branches/sculpt25/source/blender/editors/space_node/node_ops.c
branches/sculpt25/source/blender/editors/space_node/space_node.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/sculpt25/source/blender/editors/space_sequencer/space_sequencer.c
branches/sculpt25/source/blender/editors/space_time/space_time.c
branches/sculpt25/source/blender/editors/space_view3d/space_view3d.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_buttons.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_edit.c
branches/sculpt25/source/blender/editors/space_view3d/view3d_select.c
branches/sculpt25/source/blender/editors/transform/transform.c
branches/sculpt25/source/blender/editors/transform/transform.h
branches/sculpt25/source/blender/editors/transform/transform_conversions.c
branches/sculpt25/source/blender/editors/transform/transform_manipulator.c
branches/sculpt25/source/blender/editors/transform/transform_ops.c
branches/sculpt25/source/blender/editors/transform/transform_snap.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_ops.c
branches/sculpt25/source/blender/makesdna/DNA_anim_types.h
branches/sculpt25/source/blender/makesdna/DNA_sequence_types.h
branches/sculpt25/source/blender/makesdna/DNA_space_types.h
branches/sculpt25/source/blender/makesdna/DNA_userdef_types.h
branches/sculpt25/source/blender/makesdna/DNA_windowmanager_types.h
branches/sculpt25/source/blender/makesrna/RNA_enum_types.h
branches/sculpt25/source/blender/makesrna/RNA_types.h
branches/sculpt25/source/blender/makesrna/intern/rna_ID.c
branches/sculpt25/source/blender/makesrna/intern/rna_access.c
branches/sculpt25/source/blender/makesrna/intern/rna_animation.c
branches/sculpt25/source/blender/makesrna/intern/rna_animation_api.c
branches/sculpt25/source/blender/makesrna/intern/rna_armature.c
branches/sculpt25/source/blender/makesrna/intern/rna_fcurve.c
branches/sculpt25/source/blender/makesrna/intern/rna_internal.h
branches/sculpt25/source/blender/makesrna/intern/rna_object.c
branches/sculpt25/source/blender/makesrna/intern/rna_scene.c
branches/sculpt25/source/blender/makesrna/intern/rna_sequence.c
branches/sculpt25/source/blender/makesrna/intern/rna_space.c
branches/sculpt25/source/blender/makesrna/intern/rna_ui_api.c
branches/sculpt25/source/blender/makesrna/intern/rna_userdef.c
branches/sculpt25/source/blender/makesrna/intern/rna_wm.c
branches/sculpt25/source/blender/makesrna/intern/rna_wm_api.c
branches/sculpt25/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
branches/sculpt25/source/blender/python/intern/bpy_rna.c
branches/sculpt25/source/blender/render/SConscript
branches/sculpt25/source/blender/render/intern/source/texture.c
branches/sculpt25/source/blender/windowmanager/WM_types.h
branches/sculpt25/source/blender/windowmanager/intern/wm_event_system.c
branches/sculpt25/source/blender/windowmanager/intern/wm_operators.c
branches/sculpt25/source/blender/windowmanager/intern/wm_window.c
branches/sculpt25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/sculpt25/tools/btools.py
Added Paths:
-----------
branches/sculpt25/release/scripts/modules/rigify/arm_biped_generic.py
branches/sculpt25/release/scripts/modules/rigify/copy.py
branches/sculpt25/release/scripts/modules/rigify/finger_curl.py
branches/sculpt25/release/scripts/modules/rigify/leg_biped_generic.py
branches/sculpt25/release/scripts/modules/rigify/neck_flex.py
branches/sculpt25/release/scripts/modules/rigify/palm_curl.py
branches/sculpt25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/sculpt25/release/scripts/modules/rigify_utils.py
branches/sculpt25/release/scripts/op/screen_play_rendered_anim.py
Removed Paths:
-------------
branches/sculpt25/release/scripts/modules/rigify/arm.py
branches/sculpt25/release/scripts/modules/rigify/finger.py
branches/sculpt25/release/scripts/modules/rigify/leg.py
branches/sculpt25/release/scripts/modules/rigify/neck.py
branches/sculpt25/release/scripts/modules/rigify/palm.py
branches/sculpt25/release/scripts/modules/rigify/spine.py
Modified: branches/sculpt25/config/darwin-config.py
===================================================================
--- branches/sculpt25/config/darwin-config.py 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/config/darwin-config.py 2009-12-11 14:38:02 UTC (rev 25316)
@@ -270,6 +270,14 @@
#BF_EXPAT_LIB = 'expat'
#BF_EXPAT_LIBPATH = '/usr/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+if MACOSX_ARCHITECTURE == 'i386':
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+elif MACOSX_ARCHITECTURE == 'x86_64':
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
+
+
#############################################################################
################### various compile settings and flags ##################
#############################################################################
Modified: branches/sculpt25/config/linux2-config.py
===================================================================
--- branches/sculpt25/config/linux2-config.py 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/config/linux2-config.py 2009-12-11 14:38:02 UTC (rev 25316)
@@ -167,6 +167,10 @@
WITH_BF_OPENMP = True
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
##
CC = 'gcc'
CXX = 'g++'
Modified: branches/sculpt25/config/win32-mingw-config.py
===================================================================
--- branches/sculpt25/config/win32-mingw-config.py 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/config/win32-mingw-config.py 2009-12-11 14:38:02 UTC (rev 25316)
@@ -137,6 +137,10 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+
##
CC = 'gcc'
CXX = 'g++'
Modified: branches/sculpt25/config/win32-vc-config.py
===================================================================
--- branches/sculpt25/config/win32-vc-config.py 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/config/win32-vc-config.py 2009-12-11 14:38:02 UTC (rev 25316)
@@ -148,6 +148,10 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
@@ -155,6 +159,7 @@
BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
'${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
'${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+
CC = 'cl.exe'
CXX = 'cl.exe'
Modified: branches/sculpt25/config/win64-vc-config.py
===================================================================
--- branches/sculpt25/config/win64-vc-config.py 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/config/win64-vc-config.py 2009-12-11 14:38:02 UTC (rev 25316)
@@ -161,6 +161,10 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
Modified: branches/sculpt25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/sculpt25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj 2009-12-11 14:38:02 UTC (rev 25316)
@@ -340,6 +340,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\python\intern\bpy_driver.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\python\intern\bpy_interface.c"
>
</File>
Modified: branches/sculpt25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/sculpt25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2009-12-11 14:38:02 UTC (rev 25316)
@@ -1064,6 +1064,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\BKE_sequence.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_shrinkwrap.h"
>
</File>
Modified: branches/sculpt25/projectfiles_vc9/blender/loader/BLO_loader.vcproj
===================================================================
--- branches/sculpt25/projectfiles_vc9/blender/loader/BLO_loader.vcproj 2009-12-11 14:34:21 UTC (rev 25315)
+++ branches/sculpt25/projectfiles_vc9/blender/loader/BLO_loader.vcproj 2009-12-11 14:38:02 UTC (rev 25316)
@@ -490,123 +490,123 @@
RelativePath="..\..\..\source\blender\blenloader\BLO_undofile.h"
>
</File>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="..\..\..\source\blender\blenloader\intern\readblenentry.c"
>
- <File
- RelativePath="..\..\..\source\blender\blenloader\intern\readblenentry.c"
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\blenloader\intern\readfile.c"
+ >
+ <FileConfiguration
+ Name="Blender Debug|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenloader\intern\readfile.c"
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Debug|Win32"
>
- <FileConfiguration
- Name="Blender Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenloader\intern\undofile.c"
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Release|Win32"
>
- </File>
- <File
- RelativePath="..\..\..\source\blender\blenloader\intern\writefile.c"
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Blender Release|Win32"
>
- <FileConfiguration
- Name="Blender Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
- </Filter>
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="BlenderPlayer Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="BlenderPlayer Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\blenloader\intern\undofile.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\blenloader\intern\writefile.c"
+ >
+ <FileConfiguration
+ Name="Blender Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list