[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31300] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31183 :31296
Nicholas Bishop
nicholasbishop at gmail.com
Thu Aug 12 20:08:23 CEST 2010
Revision: 31300
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31300
Author: nicholasbishop
Date: 2010-08-12 20:08:22 +0200 (Thu, 12 Aug 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31183:31296
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/build_files/cmake/macros.cmake
branches/soc-2010-nicolasbishop/build_files/make/nan_compile.mk
branches/soc-2010-nicolasbishop/release/Makefile
branches/soc-2010-nicolasbishop/release/plugins/Makefile
branches/soc-2010-nicolasbishop/release/plugins/bmake
branches/soc-2010-nicolasbishop/release/plugins/sequence/Makefile
branches/soc-2010-nicolasbishop/release/plugins/texture/Makefile
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_anim_bvh.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_shape_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py
branches/soc-2010-nicolasbishop/release/scripts/modules/add_object_utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_types.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_info.py
branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py
branches/soc-2010-nicolasbishop/release/scripts/op/console_shell.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nicolasbishop/release/scripts/templates/gamelogic.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_material.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_info.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_text.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/source/Makefile
branches/soc-2010-nicolasbishop/source/blender/Makefile
branches/soc-2010-nicolasbishop/source/blender/avi/Makefile
branches/soc-2010-nicolasbishop/source/blender/avi/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenfont/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenfont/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_cloth.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_collision.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_effect.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sca.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/collision.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/key.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/nla.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/storage.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/BLO_readfile.h
branches/soc-2010-nicolasbishop/source/blender/blenloader/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/Makefile
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-nicolasbishop/source/blender/collada/Makefile
branches/soc-2010-nicolasbishop/source/blender/collada/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/animation/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/armature/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/curve/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_view3d.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/object/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_bake.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_hook.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_lattice.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/render/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_preview.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nicolasbishop/source/blender/editors/sound/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_api/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/space_console.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filesel.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/space_file.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/info_stats.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_sound/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_userpref/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/Makefile
branches/soc-2010-nicolasbishop/source/blender/gpu/Makefile
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/ikplugin/Makefile
branches/soc-2010-nicolasbishop/source/blender/ikplugin/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/imbuf/Makefile
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cineon/Makefile
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/Makefile
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/openexr/Makefile
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/Makefile
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/makesrna/Makefile
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_text.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-nicolasbishop/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2010-nicolasbishop/source/blender/modifiers/Makefile
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_none.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_util.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_util.h
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/nodes/Makefile
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/TEX_nodes/Makefile
branches/soc-2010-nicolasbishop/source/blender/python/Makefile
branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-nicolasbishop/source/blender/python/generic/Makefile
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/noise.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2010-nicolasbishop/source/blender/quicktime/Makefile
branches/soc-2010-nicolasbishop/source/blender/quicktime/apple/Makefile
branches/soc-2010-nicolasbishop/source/blender/readblenfile/Makefile
branches/soc-2010-nicolasbishop/source/blender/readblenfile/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/readblenfile/stub/Makefile
branches/soc-2010-nicolasbishop/source/blender/readblenfile/test/Makefile
branches/soc-2010-nicolasbishop/source/blender/render/Makefile
branches/soc-2010-nicolasbishop/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/render/intern/include/renderdatabase.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nicolasbishop/source/blender/verify/Makefile
branches/soc-2010-nicolasbishop/source/blender/verify/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/windowmanager/Makefile
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/Makefile
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nicolasbishop/source/creator/Makefile
branches/soc-2010-nicolasbishop/source/darwin/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Expressions/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/Joystick/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/common/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/common/unix/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/common/windows/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/src/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/src/xpcom/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/test/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/test/colorcycle/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/test/gears/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/test/stub/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/netscape/test/threaded_gears/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KXNetwork/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Network/LoopBackNetwork/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Network/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Network/TerraplayNetwork/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Physics/Bullet/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Physics/Dummy/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Physics/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Physics/common/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/SceneGraph/Makefile
branches/soc-2010-nicolasbishop/source/gameengine/VideoTexture/Makefile
branches/soc-2010-nicolasbishop/source/icons/Makefile
branches/soc-2010-nicolasbishop/source/kernel/Makefile
branches/soc-2010-nicolasbishop/source/kernel/gen_messaging/Makefile
branches/soc-2010-nicolasbishop/source/kernel/gen_messaging/intern/Makefile
branches/soc-2010-nicolasbishop/source/kernel/gen_system/Makefile
branches/soc-2010-nicolasbishop/source/tools/guess/guessconfig
Added Paths:
-----------
branches/soc-2010-nicolasbishop/release/scripts/modules/bpyml.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpyml_ui.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_idcode.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/idcode.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_lattice.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_xml_ui.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render_test.xml
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_booleans.txt
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-08-12 18:08:22 UTC (rev 31300)
@@ -316,12 +316,6 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
- IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
- ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
@@ -633,12 +627,6 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
- IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
- ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
ENDIF(MSVC)
ENDIF(WIN32)
@@ -819,12 +807,6 @@
SET(TIFF_LIBPATH ${TIFF}/lib)
ENDIF(WITH_IMAGE_TIFF)
- IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
- ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
SET(EXETYPE MACOSX_BUNDLE)
SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
@@ -868,9 +850,26 @@
ENDIF(BUILD_REV_RETURN)
ENDIF(WIN32)
ENDIF(WITH_BUILDINFO)
-
#-----------------------------------------------------------------------------
# Common.
+
+IF(WITH_RAYOPTIMIZATION)
+ IF(CMAKE_COMPILER_IS_GNUCC)
+ IF(SUPPORT_SSE_BUILD)
+ SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
+ ADD_DEFINITIONS(-D__SSE__)
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(SUPPORT_SSE_BUILD)
+ IF(SUPPORT_SSE2_BUILD)
+ SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
+ ADD_DEFINITIONS(-D__SSE2__)
+ IF(NOT SUPPORT_SSE_BUILD) # dont double up
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(NOT SUPPORT_SSE_BUILD)
+ ENDIF(SUPPORT_SSE2_BUILD)
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ENDIF(WITH_RAYOPTIMIZATION)
+
IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
Modified: branches/soc-2010-nicolasbishop/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/cmake/macros.cmake 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/build_files/cmake/macros.cmake 2010-08-12 18:08:22 UTC (rev 31300)
@@ -183,19 +183,38 @@
ENDMACRO(SETUP_LIBLINKS)
MACRO(TEST_SSE_SUPPORT)
- INCLUDE(CheckCXXSourceCompiles)
+ INCLUDE(CheckCSourceRuns)
MESSAGE(STATUS "Detecting SSE support")
IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_REQUIRED_FLAGS "-msse -msse2")
ELSEIF(MSVC)
- SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2")
+ SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2") # TODO, SSE 1 ?
ENDIF()
- CHECK_CXX_SOURCE_COMPILES("
+ CHECK_C_SOURCE_RUNS("
#include <xmmintrin.h>
int main() { __m128 v = _mm_setzero_ps(); return 0; }"
SUPPORT_SSE_BUILD)
+
+ CHECK_C_SOURCE_RUNS("
+ #include <emmintrin.h>
+ int main() { __m128d v = _mm_setzero_pd(); return 0; }"
+ SUPPORT_SSE2_BUILD)
+ MESSAGE(STATUS "Detecting SSE support")
+
+ IF(SUPPORT_SSE_BUILD)
+ MESSAGE(STATUS " ...SSE support found.")
+ ELSE(SUPPORT_SSE_BUILD)
+ MESSAGE(STATUS " ...SSE support missing.")
+ ENDIF(SUPPORT_SSE_BUILD)
+
+ IF(SUPPORT_SSE2_BUILD)
+ MESSAGE(STATUS " ...SSE2 support found.")
+ ELSE(SUPPORT_SSE2_BUILD)
+ MESSAGE(STATUS " ...SSE2 support missing.")
+ ENDIF(SUPPORT_SSE2_BUILD)
+
ENDMACRO(TEST_SSE_SUPPORT)
Modified: branches/soc-2010-nicolasbishop/build_files/make/nan_compile.mk
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/make/nan_compile.mk 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/build_files/make/nan_compile.mk 2010-08-12 18:08:22 UTC (rev 31300)
@@ -176,6 +176,9 @@
REL_CFLAGS += -O2
REL_CCFLAGS += -O2
NAN_DEPEND = true
+ ifeq ($(WITH_BF_RAYOPTIMIZATION), true)
+ CCFLAGS += -msse
+ endif
ifeq ($(CPU),alpha)
CFLAGS += -mieee
endif
Modified: branches/soc-2010-nicolasbishop/release/Makefile
===================================================================
--- branches/soc-2010-nicolasbishop/release/Makefile 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/release/Makefile 2010-08-12 18:08:22 UTC (rev 31300)
@@ -16,7 +16,7 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
Modified: branches/soc-2010-nicolasbishop/release/plugins/Makefile
===================================================================
--- branches/soc-2010-nicolasbishop/release/plugins/Makefile 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/release/plugins/Makefile 2010-08-12 18:08:22 UTC (rev 31300)
@@ -15,7 +15,7 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
Modified: branches/soc-2010-nicolasbishop/release/plugins/bmake
===================================================================
--- branches/soc-2010-nicolasbishop/release/plugins/bmake 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/release/plugins/bmake 2010-08-12 18:08:22 UTC (rev 31300)
@@ -16,7 +16,7 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
Modified: branches/soc-2010-nicolasbishop/release/plugins/sequence/Makefile
===================================================================
--- branches/soc-2010-nicolasbishop/release/plugins/sequence/Makefile 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/release/plugins/sequence/Makefile 2010-08-12 18:08:22 UTC (rev 31300)
@@ -15,7 +15,7 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
Modified: branches/soc-2010-nicolasbishop/release/plugins/texture/Makefile
===================================================================
--- branches/soc-2010-nicolasbishop/release/plugins/texture/Makefile 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/release/plugins/texture/Makefile 2010-08-12 18:08:22 UTC (rev 31300)
@@ -15,7 +15,7 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-08-12 17:48:25 UTC (rev 31299)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-08-12 18:08:22 UTC (rev 31300)
@@ -55,7 +55,7 @@
import shutil # for file copying
import bpy
-from mathutils import Vector, Euler, Matrix, RotationMatrix
+from mathutils import Vector, Euler, Matrix
def copy_file(source, dest):
# XXX - remove, can use shutil
@@ -107,19 +107,19 @@
mtx4_identity = Matrix()
# testing
-mtx_x90 = RotationMatrix( math.pi/2, 3, 'X') # used
-#mtx_x90n = RotationMatrix(-90, 3, 'x')
-#mtx_y90 = RotationMatrix( 90, 3, 'y')
-#mtx_y90n = RotationMatrix(-90, 3, 'y')
-#mtx_z90 = RotationMatrix( 90, 3, 'z')
-#mtx_z90n = RotationMatrix(-90, 3, 'z')
+mtx_x90 = Matrix.Rotation( math.pi/2, 3, 'X') # used
+#mtx_x90n = Matrix.Rotation(-90, 3, 'x')
+#mtx_y90 = Matrix.Rotation( 90, 3, 'y')
+#mtx_y90n = Matrix.Rotation(-90, 3, 'y')
+#mtx_z90 = Matrix.Rotation( 90, 3, 'z')
+#mtx_z90n = Matrix.Rotation(-90, 3, 'z')
-#mtx4_x90 = RotationMatrix( 90, 4, 'x')
-mtx4_x90n = RotationMatrix(-math.pi/2, 4, 'X') # used
-#mtx4_y90 = RotationMatrix( 90, 4, 'y')
-mtx4_y90n = RotationMatrix(-math.pi/2, 4, 'Y') # used
-mtx4_z90 = RotationMatrix( math.pi/2, 4, 'Z') # used
-mtx4_z90n = RotationMatrix(-math.pi/2, 4, 'Z') # used
+#mtx4_x90 = Matrix.Rotation( 90, 4, 'x')
+mtx4_x90n = Matrix.Rotation(-math.pi/2, 4, 'X') # used
+#mtx4_y90 = Matrix.Rotation( 90, 4, 'y')
+mtx4_y90n = Matrix.Rotation(-math.pi/2, 4, 'Y') # used
+mtx4_z90 = Matrix.Rotation( math.pi/2, 4, 'Z') # used
+mtx4_z90n = Matrix.Rotation(-math.pi/2, 4, 'Z') # used
# def strip_path(p):
# return p.split('\\')[-1].split('/')[-1]
@@ -562,7 +562,7 @@
elif type =='CAMERA':
# elif ob and type =='Camera':
y = matrix_rot * Vector((0.0, 1.0, 0.0))
- matrix_rot = RotationMatrix(math.pi/2, 3, y) * matrix_rot
+ matrix_rot = Matrix.Rotation(math.pi/2, 3, y) * matrix_rot
return matrix_rot
@@ -664,7 +664,7 @@
rot = tuple(matrix_rot.to_euler())
elif ob and ob.type =='Camera':
y = matrix_rot * Vector((0.0, 1.0, 0.0))
- matrix_rot = RotationMatrix(math.pi/2, 3, y) * matrix_rot
+ matrix_rot = Matrix.Rotation(math.pi/2, 3, y) * matrix_rot
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list