[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30708] branches/soc-2010-moguri: merge r29817-30706

Mitchell Stokes mogurijin at gmail.com
Sun Jul 25 08:39:41 CEST 2010


Revision: 30708
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30708
Author:   moguri
Date:     2010-07-25 08:39:40 +0200 (Sun, 25 Jul 2010)

Log Message:
-----------
merge r29817-30706

Modified Paths:
--------------
    branches/soc-2010-moguri/CMakeLists.txt
    branches/soc-2010-moguri/Makefile
    branches/soc-2010-moguri/SConstruct
    branches/soc-2010-moguri/doc/blender.1
    branches/soc-2010-moguri/doc/blender.1.py
    branches/soc-2010-moguri/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/soc-2010-moguri/extern/glew/include/GL/glew.h
    branches/soc-2010-moguri/extern/glew/src/glew.c
    branches/soc-2010-moguri/extern/libopenjpeg/dwt.c
    branches/soc-2010-moguri/intern/ghost/CMakeLists.txt
    branches/soc-2010-moguri/intern/ghost/GHOST_C-api.h
    branches/soc-2010-moguri/intern/ghost/GHOST_ISystem.h
    branches/soc-2010-moguri/intern/ghost/SConscript
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_System.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2010-moguri/intern/ghost/intern/Makefile
    branches/soc-2010-moguri/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/soc-2010-moguri/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2010-moguri/intern/iksolver/intern/TNT/vec.h
    branches/soc-2010-moguri/intern/itasc/MovingFrame.cpp
    branches/soc-2010-moguri/intern/smoke/intern/FLUID_3D.h
    branches/soc-2010-moguri/intern/string/intern/STR_String.cpp
    branches/soc-2010-moguri/projectfiles_vc9/blender/blender.vcproj
    branches/soc-2010-moguri/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2010-moguri/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2010-moguri/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/soc-2010-moguri/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/soc-2010-moguri/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2010-moguri/release/VERSION
    branches/soc-2010-moguri/release/datafiles/splash.png
    branches/soc-2010-moguri/release/freedesktop/blender.desktop
    branches/soc-2010-moguri/release/scripts/io/engine_render_pov.py
    branches/soc-2010-moguri/release/scripts/io/export_3ds.py
    branches/soc-2010-moguri/release/scripts/io/export_fbx.py
    branches/soc-2010-moguri/release/scripts/io/export_mdd.py
    branches/soc-2010-moguri/release/scripts/io/export_obj.py
    branches/soc-2010-moguri/release/scripts/io/export_ply.py
    branches/soc-2010-moguri/release/scripts/io/export_x3d.py
    branches/soc-2010-moguri/release/scripts/io/import_anim_bvh.py
    branches/soc-2010-moguri/release/scripts/io/import_scene_3ds.py
    branches/soc-2010-moguri/release/scripts/io/import_scene_obj.py
    branches/soc-2010-moguri/release/scripts/io/netrender/__init__.py
    branches/soc-2010-moguri/release/scripts/io/netrender/master_html.py
    branches/soc-2010-moguri/release/scripts/io/netrender/repath.py
    branches/soc-2010-moguri/release/scripts/io/netrender/slave.py
    branches/soc-2010-moguri/release/scripts/io/netrender/utils.py
    branches/soc-2010-moguri/release/scripts/modules/blend_render_info.py
    branches/soc-2010-moguri/release/scripts/modules/bpy/utils.py
    branches/soc-2010-moguri/release/scripts/modules/bpy_types.py
    branches/soc-2010-moguri/release/scripts/modules/console/complete_calltip.py
    branches/soc-2010-moguri/release/scripts/modules/rigify/__init__.py
    branches/soc-2010-moguri/release/scripts/modules/rigify/arm_biped.py
    branches/soc-2010-moguri/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/soc-2010-moguri/release/scripts/modules/rna_info.py
    branches/soc-2010-moguri/release/scripts/op/console_python.py
    branches/soc-2010-moguri/release/scripts/op/fcurve_euler_filter.py
    branches/soc-2010-moguri/release/scripts/op/mesh.py
    branches/soc-2010-moguri/release/scripts/op/nla.py
    branches/soc-2010-moguri/release/scripts/op/object.py
    branches/soc-2010-moguri/release/scripts/op/object_align.py
    branches/soc-2010-moguri/release/scripts/op/presets.py
    branches/soc-2010-moguri/release/scripts/op/sequencer.py
    branches/soc-2010-moguri/release/scripts/op/uv.py
    branches/soc-2010-moguri/release/scripts/op/uvcalc_follow_active.py
    branches/soc-2010-moguri/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2010-moguri/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2010-moguri/release/scripts/op/wm.py
    branches/soc-2010-moguri/release/scripts/presets/cloth/cotton.py
    branches/soc-2010-moguri/release/scripts/presets/cloth/denim.py
    branches/soc-2010-moguri/release/scripts/presets/cloth/leather.py
    branches/soc-2010-moguri/release/scripts/presets/cloth/rubber.py
    branches/soc-2010-moguri/release/scripts/presets/cloth/silk.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/h264.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/theora.py
    branches/soc-2010-moguri/release/scripts/presets/ffmpeg/xvid.py
    branches/soc-2010-moguri/release/scripts/presets/interaction/maya.py
    branches/soc-2010-moguri/release/scripts/presets/render/DVCPRO_HD_1080p.py
    branches/soc-2010-moguri/release/scripts/presets/render/DVCPRO_HD_720p.py
    branches/soc-2010-moguri/release/scripts/presets/render/HDTV_1080p.py
    branches/soc-2010-moguri/release/scripts/presets/render/HDTV_720p.py
    branches/soc-2010-moguri/release/scripts/presets/render/HDV_1080p.py
    branches/soc-2010-moguri/release/scripts/presets/render/TV_NTSC_16_colon_9.py
    branches/soc-2010-moguri/release/scripts/presets/render/TV_NTSC_4_colon_3.py
    branches/soc-2010-moguri/release/scripts/presets/render/TV_PAL_16_colon_9.py
    branches/soc-2010-moguri/release/scripts/presets/render/TV_PAL_4_colon_3.py
    branches/soc-2010-moguri/release/scripts/presets/sss/apple.py
    branches/soc-2010-moguri/release/scripts/presets/sss/chicken.py
    branches/soc-2010-moguri/release/scripts/presets/sss/cream.py
    branches/soc-2010-moguri/release/scripts/presets/sss/ketchup.py
    branches/soc-2010-moguri/release/scripts/presets/sss/marble.py
    branches/soc-2010-moguri/release/scripts/presets/sss/potato.py
    branches/soc-2010-moguri/release/scripts/presets/sss/skim_milk.py
    branches/soc-2010-moguri/release/scripts/presets/sss/skin1.py
    branches/soc-2010-moguri/release/scripts/presets/sss/skin2.py
    branches/soc-2010-moguri/release/scripts/presets/sss/whole_milk.py
    branches/soc-2010-moguri/release/scripts/presets/sunsky/classic.py
    branches/soc-2010-moguri/release/scripts/presets/sunsky/desert.py
    branches/soc-2010-moguri/release/scripts/presets/sunsky/mountain.py
    branches/soc-2010-moguri/release/scripts/templates/operator.py
    branches/soc-2010-moguri/release/scripts/templates/operator_modal.py
    branches/soc-2010-moguri/release/scripts/templates/operator_modal_draw.py
    branches/soc-2010-moguri/release/scripts/templates/operator_uv.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_armature.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_bone.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-moguri/release/scripts/ui/properties_game.py
    branches/soc-2010-moguri/release/scripts/ui/properties_material.py
    branches/soc-2010-moguri/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-moguri/release/scripts/ui/properties_particle.py
    branches/soc-2010-moguri/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-moguri/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2010-moguri/release/scripts/ui/properties_render.py
    branches/soc-2010-moguri/release/scripts/ui/properties_texture.py
    branches/soc-2010-moguri/release/scripts/ui/properties_world.py
    branches/soc-2010-moguri/release/scripts/ui/space_image.py
    branches/soc-2010-moguri/release/scripts/ui/space_info.py
    branches/soc-2010-moguri/release/scripts/ui/space_logic.py
    branches/soc-2010-moguri/release/scripts/ui/space_sequencer.py
    branches/soc-2010-moguri/release/scripts/ui/space_time.py
    branches/soc-2010-moguri/release/scripts/ui/space_userpref.py
    branches/soc-2010-moguri/release/scripts/ui/space_view3d.py
    branches/soc-2010-moguri/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-moguri/release/text/readme.html
    branches/soc-2010-moguri/source/Makefile
    branches/soc-2010-moguri/source/blender/avi/AVI_avi.h
    branches/soc-2010-moguri/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_blender.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_bmesh.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_brush.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_library.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_mball.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_node.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_object.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_paint.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_particle.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_sca.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_sound.h
    branches/soc-2010-moguri/source/blender/blenkernel/SConscript
    branches/soc-2010-moguri/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/action.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/armature.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/brush.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/cloth.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/collision.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/colortools.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/curve.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/exotic.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/font.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/group.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/icons.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/image.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/ipo.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/library.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/material.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/object.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/sca.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/softbody.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/sound.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/world.c
    branches/soc-2010-moguri/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-moguri/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2010-moguri/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2010-moguri/source/blender/blenlib/intern/BLI_bfile.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/math_color.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/scanfill.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/storage.c
    branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-moguri/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_deps.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_filter.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_markers.c
    branches/soc-2010-moguri/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-moguri/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2010-moguri/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2010-moguri/source/blender/editors/animation/keyframing.c
    branches/soc-2010-moguri/source/blender/editors/animation/keyingsets.c
    branches/soc-2010-moguri/source/blender/editors/armature/armature_intern.h
    branches/soc-2010-moguri/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-moguri/source/blender/editors/armature/editarmature.c
    branches/soc-2010-moguri/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2010-moguri/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2010-moguri/source/blender/editors/armature/meshlaplacian.h
    branches/soc-2010-moguri/source/blender/editors/armature/poseobject.c
    branches/soc-2010-moguri/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-moguri/source/blender/editors/curve/editcurve.c
    branches/soc-2010-moguri/source/blender/editors/curve/editfont.c
    branches/soc-2010-moguri/source/blender/editors/datafiles/SConscript
    branches/soc-2010-moguri/source/blender/editors/datafiles/splash.png.c
    branches/soc-2010-moguri/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2010-moguri/source/blender/editors/include/ED_anim_api.h
    branches/soc-2010-moguri/source/blender/editors/include/ED_armature.h
    branches/soc-2010-moguri/source/blender/editors/include/ED_datafiles.h
    branches/soc-2010-moguri/source/blender/editors/include/ED_render.h
    branches/soc-2010-moguri/source/blender/editors/include/ED_sculpt.h
    branches/soc-2010-moguri/source/blender/editors/include/UI_interface.h
    branches/soc-2010-moguri/source/blender/editors/interface/interface.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_icons.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_intern.h
    branches/soc-2010-moguri/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_ops.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_panel.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_style.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-moguri/source/blender/editors/interface/resources.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-moguri/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2010-moguri/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2010-moguri/source/blender/editors/mesh/meshtools.c
    branches/soc-2010-moguri/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-moguri/source/blender/editors/metaball/mball_ops.c
    branches/soc-2010-moguri/source/blender/editors/object/object_add.c
    branches/soc-2010-moguri/source/blender/editors/object/object_constraint.c
    branches/soc-2010-moguri/source/blender/editors/object/object_edit.c
    branches/soc-2010-moguri/source/blender/editors/object/object_intern.h
    branches/soc-2010-moguri/source/blender/editors/object/object_modifier.c
    branches/soc-2010-moguri/source/blender/editors/object/object_ops.c
    branches/soc-2010-moguri/source/blender/editors/object/object_relations.c
    branches/soc-2010-moguri/source/blender/editors/object/object_select.c
    branches/soc-2010-moguri/source/blender/editors/object/object_transform.c
    branches/soc-2010-moguri/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-moguri/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-moguri/source/blender/editors/physics/physics_ops.c
    branches/soc-2010-moguri/source/blender/editors/render/render_internal.c
    branches/soc-2010-moguri/source/blender/editors/render/render_opengl.c
    branches/soc-2010-moguri/source/blender/editors/render/render_preview.c
    branches/soc-2010-moguri/source/blender/editors/render/render_shading.c
    branches/soc-2010-moguri/source/blender/editors/screen/area.c
    branches/soc-2010-moguri/source/blender/editors/screen/screen_context.c
    branches/soc-2010-moguri/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-moguri/source/blender/editors/screen/screen_intern.h
    branches/soc-2010-moguri/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-moguri/source/blender/editors/screen/screendump.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-moguri/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_action/action_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_file/filelist.c
    branches/soc-2010-moguri/source/blender/editors/space_file/filesel.c
    branches/soc-2010-moguri/source/blender/editors/space_file/fsmenu.c
    branches/soc-2010-moguri/source/blender/editors/space_file/fsmenu.h
    branches/soc-2010-moguri/source/blender/editors/space_file/space_file.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_image/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-moguri/source/blender/editors/space_image/image_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_info/space_info.c
    branches/soc-2010-moguri/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-moguri/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2010-moguri/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_node/drawnode.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_select.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_state.c
    branches/soc-2010-moguri/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-moguri/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-moguri/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_time/space_time.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_constraints.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_generics.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_input.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_snap.c
    branches/soc-2010-moguri/source/blender/editors/util/ed_util.c
    branches/soc-2010-moguri/source/blender/editors/util/undo.c
    branches/soc-2010-moguri/source/blender/gpu/GPU_extensions.h
    branches/soc-2010-moguri/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2010-moguri/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2010-moguri/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2010-moguri/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2010-moguri/source/blender/imbuf/intern/anim.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/divers.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-moguri/source/blender/imbuf/intern/png.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-moguri/source/blender/makesdna/DNA_ID.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_action_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_color_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_node_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_sdna_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_world_types.h
    branches/soc-2010-moguri/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2010-moguri/source/blender/makesdna/intern/makesdna.c
    branches/soc-2010-moguri/source/blender/makesrna/SConscript
    branches/soc-2010-moguri/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/makesrna/intern/Makefile
    branches/soc-2010-moguri/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_action.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_color.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_group.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_timeline.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_world.c
    branches/soc-2010-moguri/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-moguri/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-moguri/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/soc-2010-moguri/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-moguri/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/soc-2010-moguri/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/soc-2010-moguri/source/blender/nodes/intern/CMP_util.c
    branches/soc-2010-moguri/source/blender/python/doc/epy/Geometry.py
    branches/soc-2010-moguri/source/blender/python/doc/examples/bpy.data.py
    branches/soc-2010-moguri/source/blender/python/doc/examples/mathutils.Vector.py
    branches/soc-2010-moguri/source/blender/python/doc/examples/mathutils.py
    branches/soc-2010-moguri/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-moguri/source/blender/python/generic/bgl.c
    branches/soc-2010-moguri/source/blender/python/generic/blf_api.c
    branches/soc-2010-moguri/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-moguri/source/blender/python/generic/geometry.c
    branches/soc-2010-moguri/source/blender/python/generic/mathutils.c
    branches/soc-2010-moguri/source/blender/python/generic/mathutils.h
    branches/soc-2010-moguri/source/blender/python/generic/mathutils_quat.c
    branches/soc-2010-moguri/source/blender/python/generic/mathutils_vector.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_app.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_rna.h
    branches/soc-2010-moguri/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/soc-2010-moguri/source/blender/render/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/render/SConscript
    branches/soc-2010-moguri/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2010-moguri/source/blender/render/intern/include/render_types.h
    branches/soc-2010-moguri/source/blender/render/intern/include/texture.h
    branches/soc-2010-moguri/source/blender/render/intern/include/volume_precache.h
    branches/soc-2010-moguri/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2010-moguri/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-moguri/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/soc-2010-moguri/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-moguri/source/blender/render/intern/source/shadeinput.c
    branches/soc-2010-moguri/source/blender/render/intern/source/texture.c
    branches/soc-2010-moguri/source/blender/render/intern/source/volume_precache.c
    branches/soc-2010-moguri/source/blender/render/intern/source/volumetric.c
    branches/soc-2010-moguri/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/windowmanager/SConscript
    branches/soc-2010-moguri/source/blender/windowmanager/WM_api.h
    branches/soc-2010-moguri/source/blender/windowmanager/WM_types.h
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-moguri/source/blender/windowmanager/wm_files.h
    branches/soc-2010-moguri/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2010-moguri/source/creator/CMakeLists.txt
    branches/soc-2010-moguri/source/creator/creator.c
    branches/soc-2010-moguri/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2010-moguri/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2010-moguri/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2010-moguri/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2010-moguri/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2010-moguri/source/gameengine/GamePlayer/netscape/common/npmac.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2010-moguri/source/gameengine/Network/NG_NetworkScene.cpp
    branches/soc-2010-moguri/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2010-moguri/source/gameengine/PyDoc/VideoTexture.py
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.render.rst
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.types.rst
    branches/soc-2010-moguri/source/gameengine/Rasterizer/Makefile
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile

Added Paths:
-----------
    branches/soc-2010-moguri/build_files/
    branches/soc-2010-moguri/build_files/cmake/
    branches/soc-2010-moguri/build_files/cmake/example_scripts/
    branches/soc-2010-moguri/build_files/make/
    branches/soc-2010-moguri/build_files/make/example_scripts/
    branches/soc-2010-moguri/build_files/scons/
    branches/soc-2010-moguri/build_files/scons/config/
    branches/soc-2010-moguri/build_files/scons/tools/
    branches/soc-2010-moguri/release/datafiles/brushicons/
    branches/soc-2010-moguri/release/windows/installer/

Removed Paths:
-------------
    branches/soc-2010-moguri/CMake/
    branches/soc-2010-moguri/build_files/cmake/
    branches/soc-2010-moguri/build_files/cmake/example_scripts/
    branches/soc-2010-moguri/build_files/make/
    branches/soc-2010-moguri/build_files/make/example_scripts/
    branches/soc-2010-moguri/build_files/scons/
    branches/soc-2010-moguri/build_files/scons/config/
    branches/soc-2010-moguri/build_files/scons/tools/
    branches/soc-2010-moguri/config/
    branches/soc-2010-moguri/make/
    branches/soc-2010-moguri/release/windows/inno/
    branches/soc-2010-moguri/source/blender/editors/datafiles/B.blend.c
    branches/soc-2010-moguri/source/blender/gpu/gpu_buffers.h
    branches/soc-2010-moguri/source/nan_compile.mk
    branches/soc-2010-moguri/source/nan_definitions.mk
    branches/soc-2010-moguri/source/nan_link.mk
    branches/soc-2010-moguri/source/nan_subdirs.mk
    branches/soc-2010-moguri/source/nan_warn.mk
    branches/soc-2010-moguri/tools/

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

Modified: branches/soc-2010-moguri/CMakeLists.txt
===================================================================
--- branches/soc-2010-moguri/CMakeLists.txt	2010-07-25 05:01:55 UTC (rev 30707)
+++ branches/soc-2010-moguri/CMakeLists.txt	2010-07-25 06:39:40 UTC (rev 30708)
@@ -55,13 +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(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)
@@ -114,7 +116,7 @@
 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)
+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)
@@ -128,6 +130,8 @@
 	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)
 
@@ -140,10 +144,6 @@
 # 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)
@@ -228,6 +228,10 @@
 			/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)
 
 	IF(WITH_TIFF)
@@ -255,6 +259,7 @@
 		SET(FFMPEG_INC ${FFMPEG}/include)
 		SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
 		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	ENDIF(WITH_FFMPEG)
 
 	IF(WITH_FFTW3)
@@ -304,6 +309,12 @@
 
 	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
@@ -388,6 +399,11 @@
 		SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
 	ENDIF(WITH_QUICKTIME)
 
+	IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+		ADD_DEFINITIONS(-D__SSE__)
+		ADD_DEFINITIONS(-D__MMX__)
+	ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
 	IF(MSVC)
 		IF(CMAKE_CL_64)
 			SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -467,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)
@@ -516,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 ")
@@ -543,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)
@@ -589,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)
 
@@ -610,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)
@@ -707,13 +729,19 @@
 		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 	ENDIF(WITH_OPENEXR)
 
-    # TODO: IF(WITH_LCMS)
+	IF(WITH_LCMS)
+		SET(LCMS ${LIBDIR}/lcms)
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+		SET(LCMS_LIBRARY lcms)
+		SET(LCMS_LIBPATH ${LCMS}/lib)
+	ENDIF(WITH_LCMS)
 
 	IF(WITH_FFMPEG)
 		SET(FFMPEG ${LIBDIR}/ffmpeg)
 		SET(FFMPEG_INC ${FFMPEG}/include)
 		SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
 		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
 	ENDIF(WITH_FFMPEG)
 
 	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
@@ -784,6 +812,12 @@
 		SET(TIFF_LIBPATH ${TIFF}/lib)
 	ENDIF(WITH_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")

Modified: branches/soc-2010-moguri/Makefile
===================================================================
--- branches/soc-2010-moguri/Makefile	2010-07-25 05:01:55 UTC (rev 30707)
+++ branches/soc-2010-moguri/Makefile	2010-07-25 06:39:40 UTC (rev 30708)
@@ -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-moguri/SConstruct
===================================================================
--- branches/soc-2010-moguri/SConstruct	2010-07-25 05:01:55 UTC (rev 30707)
+++ branches/soc-2010-moguri/SConstruct	2010-07-25 06:39:40 UTC (rev 30708)
@@ -46,16 +46,23 @@
 import re
 from tempfile import mkdtemp
 
-import tools.Blender
-import tools.btools
-import tools.bcolors
+# store path to tools
+toolpath=os.path.join(".", "build_files", "scons", "tools")
 
+# needed for importing tools
+sys.path.append(toolpath)
+
+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 = btools.VERSION # This is used in creating the local config directories
+
 ### globals ###
 platform = sys.platform
 quickie = None
@@ -117,7 +124,7 @@
 	print "Using " + toolset
 	if toolset=='mstoolkit':
 		env = BlenderEnvironment(ENV = os.environ)
-		env.Tool('mstoolkit', ['tools'])
+		env.Tool('mstoolkit', [toolpath])
 	else:
 		env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
 		# xxx commented out, as was supressing warnings under mingw..
@@ -157,7 +164,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
@@ -166,7 +173,7 @@
 
 if crossbuild and env['PLATFORM'] != 'win32':
 	print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
-	env.Tool('crossmingw', ['tools'])
+	env.Tool('crossmingw', [toolpath])
 	# todo: determine proper libs/includes etc.
 	# Needed for gui programs, console programs should do without it
 
@@ -193,7 +200,7 @@
 # NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
 # TODO: perhaps we need an option (off by default) to not do this altogether...
 if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
-	scriptsDir = env['BF_INSTALLDIR'] + os.sep + '.blender' + os.sep + 'scripts'
+	scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
 	if os.path.isdir(scriptsDir):
 		print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
 		shutil.rmtree(scriptsDir)
@@ -434,9 +441,11 @@
 	
 	blenderinstall = env.Install(dir=dir, source=B.program_list)
 
-#-- .blender
-#- dont do .blender and scripts for darwin, it is already in the bundle
+#-- local path = config files in install dir: installdir\VERSION
+#- dont do config and scripts for darwin, it is already in the bundle
 dotblendlist = []
+datafileslist = []
+datafilestargetlist = []
 dottargetlist = []
 scriptinstall = []
 
@@ -455,20 +464,29 @@
 					if f.endswith('.ttf'):
 						continue
 				
-				dotblendlist.append(os.path.join(dp, f))
-				if env['WITH_BF_FHS']:	dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[2:]))	# skip bin/.blender
-				else:					dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[1:]))	# skip bin
-				
-				dottargetlist.append(dir + os.sep + f)
+				if 'locale' in dp:
+					datafileslist.append(os.path.join(dp,f))
+					if env['WITH_BF_FHS']:	dir= os.path.join(*([BLENDERPATH] + ['datafiles'] + dp.split(os.sep)[2:]))	# skip bin/.blender
+					else:					dir= os.path.join(*([BLENDERPATH] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:]))	# skip bin
+					datafilestargetlist.append(dir + os.sep + f)
+
+				else:
+					dotblendlist.append(os.path.join(dp, f))
+					if env['WITH_BF_FHS']:	dir= os.path.join(*([BLENDERPATH] + ['config'] + dp.split(os.sep)[2:]))	# skip bin/.blender

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list