[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30541] branches/bmesh/blender: part two of bmesh merge

Joseph Eagar joeedh at gmail.com
Tue Jul 20 16:00:42 CEST 2010 

Revision: 30541
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30541
Author:   joeedh
Date:     2010-07-20 16:00:41 +0200 (Tue, 20 Jul 2010)

Log Message:
-----------
part two of bmesh merge

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/COPYING
    branches/bmesh/blender/Makefile
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/doc/blender-cmake.txt
    branches/bmesh/blender/extern/glew/include/GL/glew.h
    branches/bmesh/blender/extern/glew/src/glew.c
    branches/bmesh/blender/extern/libopenjpeg/dwt.c
    branches/bmesh/blender/extern/libopenjpeg/opj_malloc.h
    branches/bmesh/blender/extern/lzo/minilzo/Makefile
    branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
    branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.h
    branches/bmesh/blender/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/bmesh/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
    branches/bmesh/blender/intern/bsp/intern/BSP_MeshPrimitives.cpp
    branches/bmesh/blender/intern/bsp/intern/CSG_BooleanOps.cpp
    branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
    branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp
    branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp
    branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/main.cpp
    branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/plyfile.c
    branches/bmesh/blender/intern/container/intern/CTR_List.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_EdgeCollapser.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_ExternNormalEditor.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_FaceNormalEditor.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_ManMesh2.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_MeshPrimitives.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_QSDecimator.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_QuadricEditor.cpp
    branches/bmesh/blender/intern/decimation/intern/LOD_decimation.cpp
    branches/bmesh/blender/intern/decimation/intern/future/LOD_ExternVColorEditor.cpp
    branches/bmesh/blender/intern/decimation/intern/future/LOD_NdQSDecimator.cpp
    branches/bmesh/blender/intern/decimation/intern/future/LOD_NdQuadric.cpp
    branches/bmesh/blender/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
    branches/bmesh/blender/intern/decimation/test/decimate_glut_test/intern/LOD_GhostTestApp.cpp
    branches/bmesh/blender/intern/decimation/test/decimate_glut_test/intern/common/GlutDrawer.cpp
    branches/bmesh/blender/intern/decimation/test/decimate_glut_test/intern/common/GlutKeyboardManager.cpp
    branches/bmesh/blender/intern/decimation/test/decimate_glut_test/intern/common/GlutMouseManager.cpp
    branches/bmesh/blender/intern/decimation/test/decimate_glut_test/intern/main.cpp
    branches/bmesh/blender/intern/decimation/test/decimate_glut_test/intern/ply/plyfile.c
    branches/bmesh/blender/intern/elbeem/CMakeLists.txt
    branches/bmesh/blender/intern/ghost/CMakeLists.txt
    branches/bmesh/blender/intern/ghost/GHOST_C-api.h
    branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
    branches/bmesh/blender/intern/ghost/GHOST_IWindow.h
    branches/bmesh/blender/intern/ghost/SConscript
    branches/bmesh/blender/intern/ghost/intern/GHOST_Buttons.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_C-api.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManager.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_ISystem.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_ModifierKeys.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_Rect.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_System.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_System.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_TimerManager.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_Window.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_Window.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.h
    branches/bmesh/blender/intern/ghost/intern/Makefile
    branches/bmesh/blender/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/bmesh/blender/intern/ghost/test/gears/GHOST_C-Test.c
    branches/bmesh/blender/intern/ghost/test/gears/GHOST_Test.cpp
    branches/bmesh/blender/intern/ghost/test/multitest/Basic.c
    branches/bmesh/blender/intern/ghost/test/multitest/EventToBuf.c
    branches/bmesh/blender/intern/ghost/test/multitest/MultiTest.c
    branches/bmesh/blender/intern/ghost/test/multitest/ScrollBar.c
    branches/bmesh/blender/intern/ghost/test/multitest/Util.c
    branches/bmesh/blender/intern/ghost/test/multitest/WindowData.c
    branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h
    branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
    branches/bmesh/blender/intern/guardedalloc/test/simpletest/memtest.c
    branches/bmesh/blender/intern/iksolver/intern/IK_QSegment.cpp
    branches/bmesh/blender/intern/iksolver/intern/TNT/svd.h
    branches/bmesh/blender/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp
    branches/bmesh/blender/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp
    branches/bmesh/blender/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp
    branches/bmesh/blender/intern/iksolver/test/ik_glut_test/intern/main.cpp
    branches/bmesh/blender/intern/itasc/Armature.cpp
    branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/bmesh/blender/intern/memutil/intern/MEM_RefCountedC-Api.cpp
    branches/bmesh/blender/intern/moto/intern/MT_CmMatrix4x4.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Matrix3x3.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Matrix4x4.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Plane3.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Point3.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Quaternion.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Transform.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Vector2.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Vector3.cpp
    branches/bmesh/blender/intern/moto/intern/MT_Vector4.cpp
    branches/bmesh/blender/intern/moto/intern/MT_random.cpp
    branches/bmesh/blender/intern/smoke/CMakeLists.txt
    branches/bmesh/blender/intern/string/STR_String.h
    branches/bmesh/blender/po/zh_CN.po
    branches/bmesh/blender/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/blender.sln
    branches/bmesh/blender/projectfiles_vc9/blender/blender.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/bmesh/blender/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/bmesh/blender/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/bmesh/blender/release/VERSION
    branches/bmesh/blender/release/datafiles/blenderbuttons
    branches/bmesh/blender/release/datafiles/splash.png
    branches/bmesh/blender/release/freedesktop/blender.desktop
    branches/bmesh/blender/release/getversion.py
    branches/bmesh/blender/release/plugins/sequence/blur.c
    branches/bmesh/blender/release/scripts/io/engine_render_pov.py
    branches/bmesh/blender/release/scripts/io/export_3ds.py
    branches/bmesh/blender/release/scripts/io/export_fbx.py
    branches/bmesh/blender/release/scripts/io/export_mdd.py
    branches/bmesh/blender/release/scripts/io/export_obj.py
    branches/bmesh/blender/release/scripts/io/export_ply.py
    branches/bmesh/blender/release/scripts/io/export_x3d.py
    branches/bmesh/blender/release/scripts/io/import_anim_bvh.py
    branches/bmesh/blender/release/scripts/io/import_scene_3ds.py
    branches/bmesh/blender/release/scripts/io/import_scene_obj.py
    branches/bmesh/blender/release/scripts/io/import_shape_mdd.py
    branches/bmesh/blender/release/scripts/io/netrender/__init__.py
    branches/bmesh/blender/release/scripts/io/netrender/client.py
    branches/bmesh/blender/release/scripts/io/netrender/master.py
    branches/bmesh/blender/release/scripts/io/netrender/master_html.py
    branches/bmesh/blender/release/scripts/io/netrender/model.py
    branches/bmesh/blender/release/scripts/io/netrender/netrender.css
    branches/bmesh/blender/release/scripts/io/netrender/operators.py
    branches/bmesh/blender/release/scripts/io/netrender/slave.py
    branches/bmesh/blender/release/scripts/io/netrender/ui.py
    branches/bmesh/blender/release/scripts/io/netrender/utils.py
    branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
    branches/bmesh/blender/release/scripts/modules/bpy/utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_types.py
    branches/bmesh/blender/release/scripts/modules/console/complete_calltip.py
    branches/bmesh/blender/release/scripts/modules/console/complete_import.py
    branches/bmesh/blender/release/scripts/modules/graphviz_export.py
    branches/bmesh/blender/release/scripts/modules/rigify/__init__.py
    branches/bmesh/blender/release/scripts/modules/rigify/arm_biped.py
    branches/bmesh/blender/release/scripts/modules/rigify/copy.py
    branches/bmesh/blender/release/scripts/modules/rigify/eye_balls.py
    branches/bmesh/blender/release/scripts/modules/rigify/eye_lid.py
    branches/bmesh/blender/release/scripts/modules/rigify/finger_curl.py
    branches/bmesh/blender/release/scripts/modules/rigify/leg_biped.py
    branches/bmesh/blender/release/scripts/modules/rigify/leg_quadruped.py
    branches/bmesh/blender/release/scripts/modules/rigify/mouth.py
    branches/bmesh/blender/release/scripts/modules/rigify/neck_flex.py
    branches/bmesh/blender/release/scripts/modules/rigify/palm_curl.py
    branches/bmesh/blender/release/scripts/modules/rigify/shape_key_control.py
    branches/bmesh/blender/release/scripts/modules/rigify/shape_key_distance.py
    branches/bmesh/blender/release/scripts/modules/rigify/shape_key_rotdiff.py
    branches/bmesh/blender/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/bmesh/blender/release/scripts/modules/rigify/stretch.py
    branches/bmesh/blender/release/scripts/modules/rigify/stretch_twist.py
    branches/bmesh/blender/release/scripts/modules/rigify/tail_control.py
    branches/bmesh/blender/release/scripts/modules/rigify/track_dual.py
    branches/bmesh/blender/release/scripts/modules/rigify/track_reverse.py
    branches/bmesh/blender/release/scripts/modules/rigify_utils.py
    branches/bmesh/blender/release/scripts/modules/rna_info.py
    branches/bmesh/blender/release/scripts/modules/rna_prop_ui.py
    branches/bmesh/blender/release/scripts/op/add_armature_human.py
    branches/bmesh/blender/release/scripts/op/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/op/fcurve_euler_filter.py
    branches/bmesh/blender/release/scripts/op/image.py
    branches/bmesh/blender/release/scripts/op/mesh.py
    branches/bmesh/blender/release/scripts/op/object.py
    branches/bmesh/blender/release/scripts/op/object_align.py
    branches/bmesh/blender/release/scripts/op/object_randomize_transform.py
    branches/bmesh/blender/release/scripts/op/presets.py
    branches/bmesh/blender/release/scripts/op/screen_play_rendered_anim.py
    branches/bmesh/blender/release/scripts/op/sequencer.py
    branches/bmesh/blender/release/scripts/op/uv.py
    branches/bmesh/blender/release/scripts/op/uvcalc_follow_active.py
    branches/bmesh/blender/release/scripts/op/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/op/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/op/wm.py
    branches/bmesh/blender/release/scripts/presets/cloth/cotton.py
    branches/bmesh/blender/release/scripts/presets/cloth/denim.py
    branches/bmesh/blender/release/scripts/presets/cloth/leather.py
    branches/bmesh/blender/release/scripts/presets/cloth/rubber.py
    branches/bmesh/blender/release/scripts/presets/cloth/silk.py
    branches/bmesh/blender/release/scripts/presets/render/HDTV_1080p.py
    branches/bmesh/blender/release/scripts/presets/render/HDTV_720p.py
    branches/bmesh/blender/release/scripts/presets/render/TV_PAL_16_colon_9.py
    branches/bmesh/blender/release/scripts/presets/sss/apple.py
    branches/bmesh/blender/release/scripts/presets/sss/chicken.py
    branches/bmesh/blender/release/scripts/presets/sss/cream.py
    branches/bmesh/blender/release/scripts/presets/sss/ketchup.py
    branches/bmesh/blender/release/scripts/presets/sss/marble.py
    branches/bmesh/blender/release/scripts/presets/sss/potato.py
    branches/bmesh/blender/release/scripts/presets/sss/skim_milk.py
    branches/bmesh/blender/release/scripts/presets/sss/skin1.py
    branches/bmesh/blender/release/scripts/presets/sss/skin2.py
    branches/bmesh/blender/release/scripts/presets/sss/whole_milk.py
    branches/bmesh/blender/release/scripts/presets/sunsky/classic.py
    branches/bmesh/blender/release/scripts/presets/sunsky/desert.py
    branches/bmesh/blender/release/scripts/presets/sunsky/mountain.py
    branches/bmesh/blender/release/scripts/templates/gamelogic.py
    branches/bmesh/blender/release/scripts/templates/operator.py
    branches/bmesh/blender/release/scripts/templates/operator_modal.py
    branches/bmesh/blender/release/scripts/templates/operator_modal_draw.py
    branches/bmesh/blender/release/scripts/templates/operator_simple.py
    branches/bmesh/blender/release/scripts/templates/operator_uv.py
    branches/bmesh/blender/release/scripts/ui/properties_animviz.py
    branches/bmesh/blender/release/scripts/ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/ui/properties_data_armature_rigify.py
    branches/bmesh/blender/release/scripts/ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/ui/properties_data_curve.py
    branches/bmesh/blender/release/scripts/ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/ui/properties_game.py
    branches/bmesh/blender/release/scripts/ui/properties_material.py
    branches/bmesh/blender/release/scripts/ui/properties_object.py
    branches/bmesh/blender/release/scripts/ui/properties_object_constraint.py
    branches/bmesh/blender/release/scripts/ui/properties_particle.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_cloth.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_common.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_softbody.py
    branches/bmesh/blender/release/scripts/ui/properties_render.py
    branches/bmesh/blender/release/scripts/ui/properties_scene.py
    branches/bmesh/blender/release/scripts/ui/properties_texture.py
    branches/bmesh/blender/release/scripts/ui/properties_world.py
    branches/bmesh/blender/release/scripts/ui/space_buttons.py
    branches/bmesh/blender/release/scripts/ui/space_dopesheet.py
    branches/bmesh/blender/release/scripts/ui/space_graph.py
    branches/bmesh/blender/release/scripts/ui/space_image.py
    branches/bmesh/blender/release/scripts/ui/space_info.py
    branches/bmesh/blender/release/scripts/ui/space_logic.py
    branches/bmesh/blender/release/scripts/ui/space_nla.py
    branches/bmesh/blender/release/scripts/ui/space_node.py
    branches/bmesh/blender/release/scripts/ui/space_outliner.py
    branches/bmesh/blender/release/scripts/ui/space_sequencer.py
    branches/bmesh/blender/release/scripts/ui/space_text.py
    branches/bmesh/blender/release/scripts/ui/space_time.py
    branches/bmesh/blender/release/scripts/ui/space_userpref.py
    branches/bmesh/blender/release/scripts/ui/space_view3d.py
    branches/bmesh/blender/release/scripts/ui/space_view3d_toolbar.py
    branches/bmesh/blender/release/text/readme.html
    branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
    branches/bmesh/blender/source/blender/python/generic/mathutils.c
    branches/bmesh/blender/source/creator/creator.c

Added Paths:
-----------
    branches/bmesh/blender/build_files/
    branches/bmesh/blender/build_files/cmake/
    branches/bmesh/blender/build_files/cmake/macros.cmake
    branches/bmesh/blender/build_files/make/
    branches/bmesh/blender/build_files/make/example_scripts/
    branches/bmesh/blender/build_files/make/example_scripts/linux_nanmakefiles.sh
    branches/bmesh/blender/build_files/make/example_scripts/macos_nanmakefiles.sh
    branches/bmesh/blender/build_files/make/example_scripts/sunos_nanmakefiles.sh
    branches/bmesh/blender/build_files/make/nan_compile.mk
    branches/bmesh/blender/build_files/make/nan_definitions.mk
    branches/bmesh/blender/build_files/make/nan_link.mk
    branches/bmesh/blender/build_files/make/nan_subdirs.mk
    branches/bmesh/blender/build_files/make/nan_warn.mk
    branches/bmesh/blender/build_files/scons/
    branches/bmesh/blender/build_files/scons/config/
    branches/bmesh/blender/build_files/scons/config/aix4-config.py
    branches/bmesh/blender/build_files/scons/config/darwin-config.py
    branches/bmesh/blender/build_files/scons/config/irix6-config.py
    branches/bmesh/blender/build_files/scons/config/linux2-config.py
    branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
    branches/bmesh/blender/build_files/scons/config/openbsd3-config.py
    branches/bmesh/blender/build_files/scons/config/sunos5-config.py
    branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
    branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/build_files/scons/tools/
    branches/bmesh/blender/build_files/scons/tools/Blender.py
    branches/bmesh/blender/build_files/scons/tools/__init__.py
    branches/bmesh/blender/build_files/scons/tools/bcolors.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/build_files/scons/tools/crossmingw.py
    branches/bmesh/blender/build_files/scons/tools/mstoolkit.py
    branches/bmesh/blender/doc/blender.1
    branches/bmesh/blender/doc/blender.1.py
    branches/bmesh/blender/extern/libopenjpeg/patches/fbsd.patch
    branches/bmesh/blender/intern/ghost/GHOST_Path-api.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_Path-api.cpp
    branches/bmesh/blender/projectfiles_vc9/blender/modifiers/
    branches/bmesh/blender/projectfiles_vc9/blender/modifiers/modifiers.vcproj
    branches/bmesh/blender/release/scripts/io/netrender/repath.py
    branches/bmesh/blender/release/scripts/keyingsets/
    branches/bmesh/blender/release/scripts/keyingsets/keyingsets_builtins.py
    branches/bmesh/blender/release/scripts/keyingsets/keyingsets_utils.py
    branches/bmesh/blender/release/scripts/modules/add_object_utils.py
    branches/bmesh/blender/release/scripts/modules/blend_render_info.py
    branches/bmesh/blender/release/scripts/modules/rigify/neck.py
    branches/bmesh/blender/release/scripts/modules/rigify/tongue.py
    branches/bmesh/blender/release/scripts/op/nla.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/
    branches/bmesh/blender/release/scripts/presets/ffmpeg/DV.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/DVD.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/SVCD.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/VCD.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/h264.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/theora.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/xvid.py
    branches/bmesh/blender/release/scripts/presets/interaction/
    branches/bmesh/blender/release/scripts/presets/interaction/blender.py
    branches/bmesh/blender/release/scripts/presets/interaction/maya.py
    branches/bmesh/blender/release/scripts/presets/render/DVCPRO_HD_1080p.py
    branches/bmesh/blender/release/scripts/presets/render/DVCPRO_HD_720p.py
    branches/bmesh/blender/release/scripts/presets/render/HDV_1080p.py
    branches/bmesh/blender/release/scripts/presets/render/TV_NTSC_16_colon_9.py
    branches/bmesh/blender/release/scripts/presets/render/TV_NTSC_4_colon_3.py
    branches/bmesh/blender/release/scripts/presets/render/TV_PAL_4_colon_3.py
    branches/bmesh/blender/release/scripts/templates/operator_modal_view3d.py
    branches/bmesh/blender/release/scripts/ui/space_userpref_keymap.py
    branches/bmesh/blender/release/windows/installer/
    branches/bmesh/blender/release/windows/installer/00.checked.bmp
    branches/bmesh/blender/release/windows/installer/00.header.bmp
    branches/bmesh/blender/release/windows/installer/00.installer.ico
    branches/bmesh/blender/release/windows/installer/00.sconsblender.nsi

Removed Paths:
-------------
    branches/bmesh/blender/CMake/
    branches/bmesh/blender/INSTALL
    branches/bmesh/blender/README
    branches/bmesh/blender/build_files/cmake/
    branches/bmesh/blender/build_files/cmake/macros.cmake
    branches/bmesh/blender/build_files/make/
    branches/bmesh/blender/build_files/make/example_scripts/
    branches/bmesh/blender/build_files/make/example_scripts/linux_nanmakefiles.sh
    branches/bmesh/blender/build_files/make/example_scripts/macos_nanmakefiles.sh
    branches/bmesh/blender/build_files/make/example_scripts/sunos_nanmakefiles.sh
    branches/bmesh/blender/build_files/make/nan_compile.mk
    branches/bmesh/blender/build_files/make/nan_definitions.mk
    branches/bmesh/blender/build_files/make/nan_link.mk
    branches/bmesh/blender/build_files/make/nan_subdirs.mk
    branches/bmesh/blender/build_files/make/nan_warn.mk
    branches/bmesh/blender/build_files/scons/
    branches/bmesh/blender/build_files/scons/config/
    branches/bmesh/blender/build_files/scons/config/aix4-config.py
    branches/bmesh/blender/build_files/scons/config/darwin-config.py
    branches/bmesh/blender/build_files/scons/config/irix6-config.py
    branches/bmesh/blender/build_files/scons/config/linux2-config.py
    branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
    branches/bmesh/blender/build_files/scons/config/openbsd3-config.py
    branches/bmesh/blender/build_files/scons/config/sunos5-config.py
    branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
    branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/build_files/scons/tools/
    branches/bmesh/blender/build_files/scons/tools/Blender.py
    branches/bmesh/blender/build_files/scons/tools/__init__.py
    branches/bmesh/blender/build_files/scons/tools/bcolors.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/build_files/scons/tools/crossmingw.py
    branches/bmesh/blender/build_files/scons/tools/mstoolkit.py
    branches/bmesh/blender/config/
    branches/bmesh/blender/make/
    branches/bmesh/blender/projectfiles_vc9/blender/modifiers/modifiers.vcproj
    branches/bmesh/blender/release/scripts/keyingsets/keyingsets_builtins.py
    branches/bmesh/blender/release/scripts/keyingsets/keyingsets_utils.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/DV.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/DVD.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/SVCD.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/VCD.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/h264.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/theora.py
    branches/bmesh/blender/release/scripts/presets/ffmpeg/xvid.py
    branches/bmesh/blender/release/scripts/presets/interaction/blender.py
    branches/bmesh/blender/release/scripts/presets/interaction/maya.py
    branches/bmesh/blender/release/scripts/presets/render/TV_NTSC.py
    branches/bmesh/blender/release/scripts/presets/render/TV_PAL.py
    branches/bmesh/blender/release/windows/inno/
    branches/bmesh/blender/release/windows/installer/00.checked.bmp
    branches/bmesh/blender/release/windows/installer/00.header.bmp
    branches/bmesh/blender/release/windows/installer/00.installer.ico
    branches/bmesh/blender/release/windows/installer/00.sconsblender.nsi
    branches/bmesh/blender/tools/

Property Changed:
----------------
    branches/bmesh/blender/release/scripts/io/import_scene_3ds.py
    branches/bmesh/blender/release/scripts/ui/properties_data_curve.py
    branches/bmesh/blender/release/scripts/ui/properties_object.py
    branches/bmesh/blender/release/scripts/ui/properties_object_constraint.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_cloth.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_common.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_softbody.py
    branches/bmesh/blender/release/scripts/ui/properties_render.py
    branches/bmesh/blender/release/scripts/ui/properties_scene.py
    branches/bmesh/blender/release/scripts/ui/space_userpref.py

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2010-07-20 13:43:09 UTC (rev 30540)
+++ branches/bmesh/blender/CMakeLists.txt	2010-07-20 14:00:41 UTC (rev 30541)
@@ -1,4 +1,4 @@
- # $Id$
+# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -42,7 +42,11 @@
 ")
 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+# quiet output for Makefiles, 'make -s' helps too
+# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+
 PROJECT(Blender)
 
 #-----------------------------------------------------------------------------
@@ -51,80 +55,104 @@
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
-# Note! - Could create this from the blender version string
-# ...but thats quite involved, make sure this matches the blender version.
-SET(BLENDER_VERSION  2.5)
+#-----------------------------------------------------------------------------
+# Load some macros.
+INCLUDE(build_files/cmake/macros.cmake)
 
 #-----------------------------------------------------------------------------
 # Set default config options
-OPTION(WITH_PLAYER        "Build Player" OFF)
-OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
-OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+
+GET_BLENDER_VERSION()
+
+# Blender internal features
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
-OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+OPTION(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+# (unix defaults to OpenMP On)
+IF(UNIX AND NOT APPLE)
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+ELSE()
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+ENDIF()
+
+# Image format support
 OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_TIFF          "Enable LibTIFF Support" ON)
 OPTION(WITH_DDS           "Enable DDS Support" ON)
+
+# Audio format support
 OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
-OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
-OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
-OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
-OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-OPTION(WITH_LZO           "Enable fast LZO compression, used for pointcache" ON)
-OPTION(WITH_LZMA          "Enable best LZMA compression, used for pointcache" ON)
-OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
-OPTION(WITH_BUILDINFO     "Include extra build details" ON)
-OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
+IF(APPLE OR WIN32)
+	OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
+ENDIF(APPLE OR WIN32)
 
-# Unix defaults to OpenMP On
+# 3D format support
+# disable opencollada on non-apple unix because opencollada has no package for debian
 IF(UNIX AND NOT APPLE)
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ELSE()
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ENDIF()
 
-OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
+# Sound output
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 
-IF (APPLE)
+# Compression
+OPTION(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
+OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
+
+# Misc
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+
+IF(APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
-ENDIF (APPLE)
+ENDIF(APPLE)
 
+IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+	MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
+ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+TEST_SSE_SUPPORT()
+
+# disabled for now, not supported
+# OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
-#   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
+#   cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
 # On Macs: 
-#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
+#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
 #
 # When changing any of this remember to update the notes in doc/blender-cmake.txt
 
 #-----------------------------------------------------------------------------
-# Load some macros.
-INCLUDE(CMake/macros.cmake)
-
-#-----------------------------------------------------------------------------
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
 
-
 	IF(WITH_OPENAL)
 		FIND_PACKAGE(OpenAL)
-		IF(OPENAL_FOUND)
-			SET(WITH_OPENAL ON)
-		ELSE(OPENAL_FOUND)
+		IF(NOT OPENAL_FOUND)
 			SET(WITH_OPENAL OFF)
-		ENDIF(OPENAL_FOUND)
+		ENDIF(NOT OPENAL_FOUND)
 	ENDIF(WITH_OPENAL)
 
 	IF(WITH_JACK)
@@ -141,38 +169,44 @@
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
 	ENDIF(WITH_SNDFILE)
 
-	FIND_LIBRARY(INTL_LIBRARY
-		NAMES intl
-		PATHS
-		/sw/lib
-	)
-	FIND_LIBRARY(ICONV_LIBRARY
-		NAMES iconv
-		PATHS
-		/sw/lib
-	)
-  
-	IF(INTL_LIBRARY AND ICONV_LIBRARY)
-		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	IF(WITH_INTERNATIONAL)
+		FIND_LIBRARY(INTL_LIBRARY
+			NAMES intl
+			PATHS
+			/sw/lib
+		)
 
+		FIND_LIBRARY(ICONV_LIBRARY
+			NAMES iconv
+			PATHS
+			/sw/lib
+		)
+
+		IF(INTL_LIBRARY AND ICONV_LIBRARY)
+			SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+		ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	ENDIF(WITH_INTERNATIONAL)
+
 	FIND_PACKAGE(Freetype)
 	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-	# No way to set py31. remove for now.
-	# FIND_PACKAGE(PythonLibs)
-	SET(PYTHON /usr)
-	SET(PYTHON_VERSION 3.1)
-	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-	# SET(PYTHON_BINARY python) # not used yet
-	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-  
-	# FIND_PACKAGE(PythonInterp) # not used yet
-	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-  
-	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
+	IF(WITH_PYTHON)
+		# No way to set py31. remove for now.
+		# FIND_PACKAGE(PythonLibs)
+		SET(PYTHON /usr)
+		SET(PYTHON_VERSION 3.1)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		# SET(PYTHON_BINARY python) # not used yet
+		SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+		SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	
+		# FIND_PACKAGE(PythonInterp) # not used yet
+		# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+
+		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	ENDIF(WITH_PYTHON)
+
 	IF(WITH_SDL)
 		FIND_PACKAGE(SDL)
 		# UNSET(SDLMAIN_LIBRARY CACHE)
@@ -181,23 +215,53 @@
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	FIND_PATH(OPENEXR_INC
-		ImfXdr.h
-		PATHS
-		/usr/local/include/OpenEXR
-		/usr/include/OpenEXR
-		/sw/include/OpenEXR
-		/opt/local/include/OpenEXR
-		/opt/csw/include/OpenEXR
-		/opt/include/OpenEXR
-	)
-	SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	IF(WITH_OPENEXR)
+		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+		FIND_PATH(OPENEXR_INC
+			ImfXdr.h
+			PATHS
+			${OPENEXR}/include/OpenEXR
+			/usr/local/include/OpenEXR
+			/sw/include/OpenEXR
+			/opt/local/include/OpenEXR
+			/opt/csw/include/OpenEXR
+			/opt/include/OpenEXR
+		)
+		SET(OPENEXR_LIB Half IlmImf Iex Imath)
+		
+		IF(NOT OPENEXR_INC)
+			SET(WITH_OPENEXR OFF)
+		ENDIF(NOT OPENEXR_INC)
+	ENDIF(WITH_OPENEXR)
 
-	SET(FFMPEG /usr)
-	SET(FFMPEG_INC ${FFMPEG}/include)
-	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list