Revision: 30392
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30392
Author: leifandersen
Date: 2010-07-15 21:49:03 +0200 (Thu, 15 Jul 2010)
Log Message:
-----------
merge with trunk: svn merge -r 30194:30389
https://svn.blender.org/svnroot/bf-blender/trunk/blender/ .
Modified Paths:
--------------
branches/soc-2010-leifandersen/CMakeLists.txt
branches/soc-2010-leifandersen/Makefile
branches/soc-2010-leifandersen/SConstruct
branches/soc-2010-leifandersen/doc/blender.1.py
branches/soc-2010-leifandersen/extern/libopenjpeg/dwt.c
branches/soc-2010-leifandersen/intern/ghost/SConscript
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-leifandersen/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/soc-2010-leifandersen/projectfiles_vc9/blender/blender.vcproj
branches/soc-2010-leifandersen/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2010-leifandersen/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2010-leifandersen/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2010-leifandersen/release/freedesktop/blender.desktop
branches/soc-2010-leifandersen/release/scripts/io/export_3ds.py
branches/soc-2010-leifandersen/release/scripts/io/export_fbx.py
branches/soc-2010-leifandersen/release/scripts/io/export_mdd.py
branches/soc-2010-leifandersen/release/scripts/io/export_obj.py
branches/soc-2010-leifandersen/release/scripts/io/export_ply.py
branches/soc-2010-leifandersen/release/scripts/io/export_x3d.py
branches/soc-2010-leifandersen/release/scripts/io/import_anim_bvh.py
branches/soc-2010-leifandersen/release/scripts/io/import_scene_3ds.py
branches/soc-2010-leifandersen/release/scripts/io/import_scene_obj.py
branches/soc-2010-leifandersen/release/scripts/modules/add_object_utils.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy_types.py
branches/soc-2010-leifandersen/release/scripts/modules/console/complete_calltip.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/__init__.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/arm_biped.py
branches/soc-2010-leifandersen/release/scripts/modules/rna_info.py
branches/soc-2010-leifandersen/release/scripts/op/console_python.py
branches/soc-2010-leifandersen/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-leifandersen/release/scripts/op/mesh.py
branches/soc-2010-leifandersen/release/scripts/op/nla.py
branches/soc-2010-leifandersen/release/scripts/op/object.py
branches/soc-2010-leifandersen/release/scripts/op/presets.py
branches/soc-2010-leifandersen/release/scripts/op/sequencer.py
branches/soc-2010-leifandersen/release/scripts/op/uv.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-leifandersen/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-leifandersen/release/scripts/presets/interaction/maya.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_uv.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_bone.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_curve.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_game.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_particle.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_common.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_texture.py
branches/soc-2010-leifandersen/release/scripts/ui/space_info.py
branches/soc-2010-leifandersen/release/scripts/ui/space_sequencer.py
branches/soc-2010-leifandersen/release/scripts/ui/space_time.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_paint.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/anim.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/armature.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/blender.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/brush.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/curve.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/displist.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/font.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/icons.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/material.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/mball.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/object.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/scene.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/world.c
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_pbvh.h
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_winstuff.h
branches/soc-2010-leifandersen/source/blender/blenlib/intern/fileops.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/path_util.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/storage.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/readfile.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/writefile.c
branches/soc-2010-leifandersen/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2010-leifandersen/source/blender/editors/animation/keyframing.c
branches/soc-2010-leifandersen/source/blender/editors/armature/armature_intern.h
branches/soc-2010-leifandersen/source/blender/editors/armature/armature_ops.c
branches/soc-2010-leifandersen/source/blender/editors/armature/poseobject.c
branches/soc-2010-leifandersen/source/blender/editors/curve/curve_ops.c
branches/soc-2010-leifandersen/source/blender/editors/curve/editcurve.c
branches/soc-2010-leifandersen/source/blender/editors/curve/editfont.c
branches/soc-2010-leifandersen/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/include/ED_datafiles.h
branches/soc-2010-leifandersen/source/blender/editors/include/UI_interface.h
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_icons.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_panel.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_regions.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_style.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_templates.c
branches/soc-2010-leifandersen/source/blender/editors/interface/resources.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_add.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_edit.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_intern.h
branches/soc-2010-leifandersen/source/blender/editors/object/object_ops.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_relations.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_ops.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/SConscript
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-leifandersen/source/blender/editors/sound/sound_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/filelist.c
branches/soc-2010-leifandersen/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/drawnode.c
branches/soc-2010-leifandersen/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_snap.c
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-leifandersen/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-leifandersen/source/blender/imbuf/intern/divers.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-leifandersen/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_ID.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_armature_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_color_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2010-leifandersen/source/blender/makesrna/SConscript
branches/soc-2010-leifandersen/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_nla.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-leifandersen/source/blender/python/doc/examples/bpy.data.py
branches/soc-2010-leifandersen/source/blender/python/doc/examples/mathutils.Vector.py
branches/soc-2010-leifandersen/source/blender/python/doc/examples/mathutils.py
branches/soc-2010-leifandersen/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-leifandersen/source/blender/python/generic/bgl.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/pipeline.c
branches/soc-2010-leifandersen/source/blender/windowmanager/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/windowmanager/SConscript
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-leifandersen/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
branches/soc-2010-leifandersen/source/creator/creator.c
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-leifandersen/source/gameengine/PyDoc/bge.types.rst
Added Paths:
-----------
branches/soc-2010-leifandersen/build_files/
branches/soc-2010-leifandersen/build_files/cmake/
branches/soc-2010-leifandersen/build_files/cmake/macros.cmake
branches/soc-2010-leifandersen/build_files/make/
branches/soc-2010-leifandersen/build_files/make/example_scripts/
branches/soc-2010-leifandersen/build_files/make/example_scripts/linux_nanmakefiles.sh
branches/soc-2010-leifandersen/build_files/make/example_scripts/macos_nanmakefiles.sh
branches/soc-2010-leifandersen/build_files/make/example_scripts/sunos_nanmakefiles.sh
branches/soc-2010-leifandersen/build_files/make/nan_compile.mk
branches/soc-2010-leifandersen/build_files/make/nan_definitions.mk
branches/soc-2010-leifandersen/build_files/make/nan_link.mk
branches/soc-2010-leifandersen/build_files/make/nan_subdirs.mk
branches/soc-2010-leifandersen/build_files/make/nan_warn.mk
branches/soc-2010-leifandersen/build_files/scons/
branches/soc-2010-leifandersen/build_files/scons/config/
branches/soc-2010-leifandersen/build_files/scons/config/aix4-config.py
branches/soc-2010-leifandersen/build_files/scons/config/darwin-config.py
branches/soc-2010-leifandersen/build_files/scons/config/irix6-config.py
branches/soc-2010-leifandersen/build_files/scons/config/linux2-config.py
branches/soc-2010-leifandersen/build_files/scons/config/linuxcross-config.py
branches/soc-2010-leifandersen/build_files/scons/config/openbsd3-config.py
branches/soc-2010-leifandersen/build_files/scons/config/sunos5-config.py
branches/soc-2010-leifandersen/build_files/scons/config/win32-mingw-config.py
branches/soc-2010-leifandersen/build_files/scons/config/win32-vc-config.py
branches/soc-2010-leifandersen/build_files/scons/config/win64-vc-config.py
branches/soc-2010-leifandersen/build_files/scons/tools/
branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py
branches/soc-2010-leifandersen/build_files/scons/tools/__init__.py
branches/soc-2010-leifandersen/build_files/scons/tools/bcolors.py
branches/soc-2010-leifandersen/build_files/scons/tools/btools.py
branches/soc-2010-leifandersen/build_files/scons/tools/crossmingw.py
branches/soc-2010-leifandersen/build_files/scons/tools/mstoolkit.py
branches/soc-2010-leifandersen/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-leifandersen/source/blender/gpu/GPU_buffers.h
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_properties.txt
Removed Paths:
-------------
branches/soc-2010-leifandersen/CMake/
branches/soc-2010-leifandersen/build_files/cmake/
branches/soc-2010-leifandersen/build_files/cmake/macros.cmake
branches/soc-2010-leifandersen/build_files/make/
branches/soc-2010-leifandersen/build_files/make/example_scripts/
branches/soc-2010-leifandersen/build_files/make/example_scripts/linux_nanmakefiles.sh
branches/soc-2010-leifandersen/build_files/make/example_scripts/macos_nanmakefiles.sh
branches/soc-2010-leifandersen/build_files/make/example_scripts/sunos_nanmakefiles.sh
branches/soc-2010-leifandersen/build_files/make/nan_compile.mk
branches/soc-2010-leifandersen/build_files/make/nan_definitions.mk
branches/soc-2010-leifandersen/build_files/make/nan_link.mk
branches/soc-2010-leifandersen/build_files/make/nan_subdirs.mk
branches/soc-2010-leifandersen/build_files/make/nan_warn.mk
branches/soc-2010-leifandersen/build_files/scons/
branches/soc-2010-leifandersen/build_files/scons/config/
branches/soc-2010-leifandersen/build_files/scons/config/aix4-config.py
branches/soc-2010-leifandersen/build_files/scons/config/darwin-config.py
branches/soc-2010-leifandersen/build_files/scons/config/irix6-config.py
branches/soc-2010-leifandersen/build_files/scons/config/linux2-config.py
branches/soc-2010-leifandersen/build_files/scons/config/linuxcross-config.py
branches/soc-2010-leifandersen/build_files/scons/config/openbsd3-config.py
branches/soc-2010-leifandersen/build_files/scons/config/sunos5-config.py
branches/soc-2010-leifandersen/build_files/scons/config/win32-mingw-config.py
branches/soc-2010-leifandersen/build_files/scons/config/win32-vc-config.py
branches/soc-2010-leifandersen/build_files/scons/config/win64-vc-config.py
branches/soc-2010-leifandersen/build_files/scons/tools/
branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py
branches/soc-2010-leifandersen/build_files/scons/tools/__init__.py
branches/soc-2010-leifandersen/build_files/scons/tools/bcolors.py
branches/soc-2010-leifandersen/build_files/scons/tools/btools.py
branches/soc-2010-leifandersen/build_files/scons/tools/crossmingw.py
branches/soc-2010-leifandersen/build_files/scons/tools/mstoolkit.py
branches/soc-2010-leifandersen/config/
branches/soc-2010-leifandersen/make/
branches/soc-2010-leifandersen/source/blender/editors/datafiles/B.blend.c
branches/soc-2010-leifandersen/source/blender/gpu/gpu_buffers.h
branches/soc-2010-leifandersen/source/nan_compile.mk
branches/soc-2010-leifandersen/source/nan_definitions.mk
branches/soc-2010-leifandersen/source/nan_link.mk
branches/soc-2010-leifandersen/source/nan_subdirs.mk
branches/soc-2010-leifandersen/source/nan_warn.mk
branches/soc-2010-leifandersen/tools/
Property Changed:
----------------
branches/soc-2010-leifandersen/release/scripts/io/import_scene_3ds.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_curve.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_common.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_render.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_scene.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref.py
Modified: branches/soc-2010-leifandersen/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/CMakeLists.txt 2010-07-15 19:42:36 UTC
(rev 30391)
+++ branches/soc-2010-leifandersen/CMakeLists.txt 2010-07-15 19:49:03 UTC
(rev 30392)
@@ -55,17 +55,15 @@
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(CMake/macros.cmake)
+INCLUDE(build_files/cmake/macros.cmake)
#-----------------------------------------------------------------------------
# Set default config options
+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)
@@ -485,7 +483,7 @@
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
- # TODO: IF(WITH_LCMS)
+ # TODO: IF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -534,7 +532,7 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm
-lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char
-fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
+ SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char
-fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
SET(CMAKE_C_FLAGS "-pipe -funsigned-char
-fno-strict-aliasing" CACHE STRING "Mingw C flags ")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw
debug C++ flags ")
@@ -561,7 +559,7 @@
SET(GETTEXT_LIB intl)
ENDIF(WITH_INTERNATIONAL)
- SET(JPEG_LIBRARY jpeg)
+ SET(JPEG_LIBRARY libjpeg)
SET(PNG_LIBRARIES png)
SET(ZLIB ${LIBDIR}/zlib)
@@ -607,7 +605,7 @@
IF(WITH_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr)
SET(OPENEXR_INC ${OPENEXR}/include
${OPENEXR}/include/OpenEXR)
- SET(OPENEXR_LIB Half IlmImf Iex)
+ SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR)
@@ -628,6 +626,12 @@
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)
Modified: branches/soc-2010-leifandersen/Makefile
===================================================================
--- branches/soc-2010-leifandersen/Makefile 2010-07-15 19:42:36 UTC (rev
30391)
+++ branches/soc-2010-leifandersen/Makefile 2010-07-15 19:49:03 UTC (rev
30392)
@@ -41,7 +41,7 @@
# export NAN_NO_OPENAL=true
export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
SOURCEDIR =
ifeq ($(FREE_WINDOWS),true)
@@ -50,7 +50,7 @@
DIRS ?= extern intern source po
endif
-include source/nan_subdirs.mk
+include build_files/make/nan_subdirs.mk
.PHONY: release
release:
Modified: branches/soc-2010-leifandersen/SConstruct
===================================================================
--- branches/soc-2010-leifandersen/SConstruct 2010-07-15 19:42:36 UTC (rev
30391)
+++ branches/soc-2010-leifandersen/SConstruct 2010-07-15 19:49:03 UTC (rev
30392)
@@ -46,17 +46,19 @@
import re
from tempfile import mkdtemp
-import tools.Blender
-import tools.btools
-import tools.bcolors
+# needed for importing tools
+sys.path.append(os.path.join(".", "build_files", "scons", "tools"))
+import Blender
+import btools
+import bcolors
+
EnsureSConsVersion(1,0,0)
-BlenderEnvironment = tools.Blender.BlenderEnvironment
-btools = tools.btools
-B = tools.Blender
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
-VERSION = tools.btools.VERSION # This is used in creating the local config
directories
+VERSION = btools.VERSION # This is used in creating the local config
directories
### globals ###
platform = sys.platform
@@ -159,7 +161,7 @@
env['OURPLATFORM'] = platform
-configfile = 'config'+os.sep+platform+'-config.py'
+configfile = os.path.join("build_files", "scons", "config", platform +
"-config.py")
if os.path.exists(configfile):
print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
Copied: branches/soc-2010-leifandersen/build_files (from rev 30389,
trunk/blender/build_files)
Copied: branches/soc-2010-leifandersen/build_files/cmake (from rev 30389,
trunk/blender/build_files/cmake)
Deleted: branches/soc-2010-leifandersen/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2010-07-15 18:41:29 UTC
(rev 30389)
+++ branches/soc-2010-leifandersen/build_files/cmake/macros.cmake
2010-07-15 19:49:03 UTC (rev 30392)
@@ -1,233 +0,0 @@
-MACRO(BLENDERLIB_NOLIST
- name
- sources
- includes)
-
- # Gather all headers
- FILE(GLOB_RECURSE INC_ALL *.h)
-
- INCLUDE_DIRECTORIES(${includes})
- ADD_LIBRARY(${name} ${INC_ALL} ${sources})
-
- # Group by location on disk
- SOURCE_GROUP(Files FILES CMakeLists.txt)
- SET(ALL_FILES ${sources} ${INC_ALL})
- FOREACH(SRC ${ALL_FILES})
- STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files"
REL_DIR "${SRC}")
- STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR
"${REL_DIR}")
- STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
- IF(REL_DIR)
- SOURCE_GROUP(${REL_DIR} FILES ${SRC})
- ELSE(REL_DIR)
- SOURCE_GROUP(Files FILES ${SRC})
- ENDIF(REL_DIR)
- ENDFOREACH(SRC)
-
- MESSAGE(STATUS "Configuring library ${name}")
-ENDMACRO(BLENDERLIB_NOLIST)
-
-MACRO(BLENDERLIB
- name
- sources
- includes)
-
- BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
-
- # Add to blender's list of libraries
- FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
-ENDMACRO(BLENDERLIB)
-
-MACRO(SETUP_LIBDIRS)
- # see "cmake --help-policy CMP0003"
- if(COMMAND cmake_policy)
- CMAKE_POLICY(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
-
- LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH}
${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
-
- IF(WITH_PYTHON)
- LINK_DIRECTORIES(${PYTHON_LIBPATH})
- ENDIF(WITH_PYTHON)
- IF(WITH_INTERNATIONAL)
- LINK_DIRECTORIES(${ICONV_LIBPATH})
- LINK_DIRECTORIES(${GETTEXT_LIBPATH})
- ENDIF(WITH_INTERNATIONAL)
- IF(WITH_SDL)
- LINK_DIRECTORIES(${SDL_LIBPATH})
- ENDIF(WITH_SDL)
- IF(WITH_FFMPEG)
- LINK_DIRECTORIES(${FFMPEG_LIBPATH})
- ENDIF(WITH_FFMPEG)
- IF(WITH_OPENEXR)
- LINK_DIRECTORIES(${OPENEXR_LIBPATH})
- ENDIF(WITH_OPENEXR)
- IF(WITH_TIFF)
- LINK_DIRECTORIES(${TIFF_LIBPATH})
- ENDIF(WITH_TIFF)
- IF(WITH_LCMS)
- LINK_DIRECTORIES(${LCMS_LIBPATH})
- ENDIF(WITH_LCMS)
- IF(WITH_QUICKTIME)
- LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
- ENDIF(WITH_QUICKTIME)
- IF(WITH_OPENAL)
- LINK_DIRECTORIES(${OPENAL_LIBPATH})
- ENDIF(WITH_OPENAL)
- IF(WITH_JACK)
- LINK_DIRECTORIES(${JACK_LIBPATH})
- ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- LINK_DIRECTORIES(${SNDFILE_LIBPATH})
- ENDIF(WITH_SNDFILE)
- IF(WITH_FFTW3)
- LINK_DIRECTORIES(${FFTW3_LIBPATH})
- ENDIF(WITH_FFTW3)
- IF(WITH_OPENCOLLADA)
- LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
- LINK_DIRECTORIES(${PCRE_LIBPATH})
- LINK_DIRECTORIES(${EXPAT_LIBPATH})
- ENDIF(WITH_OPENCOLLADA)
-
- IF(WIN32)
- LINK_DIRECTORIES(${PTHREADS_LIBPATH})
- ENDIF(WIN32)
-ENDMACRO(SETUP_LIBDIRS)
-
-MACRO(SETUP_LIBLINKS
- target)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
${PLATFORM_LINKFLAGS} ")
-
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}
${LLIBS})
-
- # since we are using the local libs for python when compiling msvc
projects, we need to add _d when compiling debug versions
- IF(WITH_PYTHON)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
-
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_PYTHON)
-
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB}
${PNG_LIB} ${ZLIB_LIB})
- TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY}
${LIBSAMPLERATE_LIB})
-
- IF(WITH_INTERNATIONAL)
- TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
-
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_INTERNATIONAL)
-
- IF(WITH_OPENAL)
- TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
- ENDIF(WITH_OPENAL)
- IF(WITH_FFTW3)
- TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
- ENDIF(WITH_FFTW3)
- IF(WITH_JACK)
- TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
- ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
- ENDIF(WITH_SNDFILE)
- IF(WITH_SDL)
- TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
- ENDIF(WITH_SDL)
- IF(WITH_QUICKTIME)
- TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
- ENDIF(WITH_QUICKTIME)
- IF(WITH_TIFF)
- TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
- ENDIF(WITH_TIFF)
- IF(WITH_OPENEXR)
- IF(WIN32)
- FOREACH(loop_var ${OPENEXR_LIB})
- TARGET_LINK_LIBRARIES(${target} debug
${loop_var}_d)
- TARGET_LINK_LIBRARIES(${target} optimized
${loop_var})
- ENDFOREACH(loop_var)
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_OPENEXR)
- IF(WITH_LCMS)
- TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY})
- ENDIF(WITH_LCMS)
- IF(WITH_FFMPEG)
- TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
- ENDIF(WITH_FFMPEG)
- IF(WITH_OPENCOLLADA)
- IF(WIN32)
- FOREACH(loop_var ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} debug
${loop_var}_d)
- TARGET_LINK_LIBRARIES(${target} optimized
${loop_var})
- ENDFOREACH(loop_var)
- TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
- IF(EXPAT_LIB)
- TARGET_LINK_LIBRARIES(${target} debug
${EXPAT_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized
${EXPAT_LIB})
- ENDIF(EXPAT_LIB)
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
- TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
- ENDIF(WIN32)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
