[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30714] branches/soc-2010-merwin: merged 29285:30707 from trunk
Mike Erwin
significant.bit at gmail.com
Sun Jul 25 12:09:18 CEST 2010
Revision: 30714
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30714
Author: merwin
Date: 2010-07-25 12:09:17 +0200 (Sun, 25 Jul 2010)
Log Message:
-----------
merged 29285:30707 from trunk
Modified Paths:
--------------
branches/soc-2010-merwin/CMakeLists.txt
branches/soc-2010-merwin/Makefile
branches/soc-2010-merwin/SConstruct
branches/soc-2010-merwin/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/soc-2010-merwin/extern/glew/include/GL/glew.h
branches/soc-2010-merwin/extern/glew/src/glew.c
branches/soc-2010-merwin/extern/libopenjpeg/dwt.c
branches/soc-2010-merwin/intern/ghost/CMakeLists.txt
branches/soc-2010-merwin/intern/ghost/GHOST_C-api.h
branches/soc-2010-merwin/intern/ghost/GHOST_ISystem.h
branches/soc-2010-merwin/intern/ghost/SConscript
branches/soc-2010-merwin/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2010-merwin/intern/ghost/intern/Makefile
branches/soc-2010-merwin/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/soc-2010-merwin/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-merwin/intern/iksolver/intern/TNT/vec.h
branches/soc-2010-merwin/intern/itasc/MovingFrame.cpp
branches/soc-2010-merwin/intern/smoke/intern/FLUID_3D.h
branches/soc-2010-merwin/intern/string/intern/STR_String.cpp
branches/soc-2010-merwin/projectfiles_vc9/blender/blender.vcproj
branches/soc-2010-merwin/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2010-merwin/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2010-merwin/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
branches/soc-2010-merwin/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2010-merwin/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2010-merwin/release/VERSION
branches/soc-2010-merwin/release/datafiles/splash.png
branches/soc-2010-merwin/release/freedesktop/blender.desktop
branches/soc-2010-merwin/release/scripts/io/engine_render_pov.py
branches/soc-2010-merwin/release/scripts/io/export_3ds.py
branches/soc-2010-merwin/release/scripts/io/export_fbx.py
branches/soc-2010-merwin/release/scripts/io/export_mdd.py
branches/soc-2010-merwin/release/scripts/io/export_obj.py
branches/soc-2010-merwin/release/scripts/io/export_ply.py
branches/soc-2010-merwin/release/scripts/io/export_x3d.py
branches/soc-2010-merwin/release/scripts/io/import_anim_bvh.py
branches/soc-2010-merwin/release/scripts/io/import_scene_3ds.py
branches/soc-2010-merwin/release/scripts/io/import_scene_obj.py
branches/soc-2010-merwin/release/scripts/io/import_shape_mdd.py
branches/soc-2010-merwin/release/scripts/io/netrender/__init__.py
branches/soc-2010-merwin/release/scripts/io/netrender/master.py
branches/soc-2010-merwin/release/scripts/io/netrender/master_html.py
branches/soc-2010-merwin/release/scripts/io/netrender/operators.py
branches/soc-2010-merwin/release/scripts/io/netrender/repath.py
branches/soc-2010-merwin/release/scripts/io/netrender/slave.py
branches/soc-2010-merwin/release/scripts/io/netrender/utils.py
branches/soc-2010-merwin/release/scripts/modules/add_object_utils.py
branches/soc-2010-merwin/release/scripts/modules/bpy/utils.py
branches/soc-2010-merwin/release/scripts/modules/bpy_types.py
branches/soc-2010-merwin/release/scripts/modules/console/complete_calltip.py
branches/soc-2010-merwin/release/scripts/modules/graphviz_export.py
branches/soc-2010-merwin/release/scripts/modules/rigify/__init__.py
branches/soc-2010-merwin/release/scripts/modules/rigify/arm_biped.py
branches/soc-2010-merwin/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-merwin/release/scripts/modules/rna_info.py
branches/soc-2010-merwin/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-merwin/release/scripts/op/console_python.py
branches/soc-2010-merwin/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-merwin/release/scripts/op/image.py
branches/soc-2010-merwin/release/scripts/op/mesh.py
branches/soc-2010-merwin/release/scripts/op/nla.py
branches/soc-2010-merwin/release/scripts/op/object.py
branches/soc-2010-merwin/release/scripts/op/object_align.py
branches/soc-2010-merwin/release/scripts/op/presets.py
branches/soc-2010-merwin/release/scripts/op/sequencer.py
branches/soc-2010-merwin/release/scripts/op/uv.py
branches/soc-2010-merwin/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-merwin/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-merwin/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-merwin/release/scripts/op/wm.py
branches/soc-2010-merwin/release/scripts/presets/cloth/cotton.py
branches/soc-2010-merwin/release/scripts/presets/cloth/denim.py
branches/soc-2010-merwin/release/scripts/presets/cloth/leather.py
branches/soc-2010-merwin/release/scripts/presets/cloth/rubber.py
branches/soc-2010-merwin/release/scripts/presets/cloth/silk.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/DV.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/DVD.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/SVCD.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/VCD.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/h264.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/theora.py
branches/soc-2010-merwin/release/scripts/presets/ffmpeg/xvid.py
branches/soc-2010-merwin/release/scripts/presets/interaction/maya.py
branches/soc-2010-merwin/release/scripts/presets/render/DVCPRO_HD_1080p.py
branches/soc-2010-merwin/release/scripts/presets/render/DVCPRO_HD_720p.py
branches/soc-2010-merwin/release/scripts/presets/render/HDTV_1080p.py
branches/soc-2010-merwin/release/scripts/presets/render/HDTV_720p.py
branches/soc-2010-merwin/release/scripts/presets/render/HDV_1080p.py
branches/soc-2010-merwin/release/scripts/presets/render/TV_NTSC_16_colon_9.py
branches/soc-2010-merwin/release/scripts/presets/render/TV_NTSC_4_colon_3.py
branches/soc-2010-merwin/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/soc-2010-merwin/release/scripts/presets/render/TV_PAL_4_colon_3.py
branches/soc-2010-merwin/release/scripts/presets/sss/apple.py
branches/soc-2010-merwin/release/scripts/presets/sss/chicken.py
branches/soc-2010-merwin/release/scripts/presets/sss/cream.py
branches/soc-2010-merwin/release/scripts/presets/sss/ketchup.py
branches/soc-2010-merwin/release/scripts/presets/sss/marble.py
branches/soc-2010-merwin/release/scripts/presets/sss/potato.py
branches/soc-2010-merwin/release/scripts/presets/sss/skim_milk.py
branches/soc-2010-merwin/release/scripts/presets/sss/skin1.py
branches/soc-2010-merwin/release/scripts/presets/sss/skin2.py
branches/soc-2010-merwin/release/scripts/presets/sss/whole_milk.py
branches/soc-2010-merwin/release/scripts/presets/sunsky/classic.py
branches/soc-2010-merwin/release/scripts/presets/sunsky/desert.py
branches/soc-2010-merwin/release/scripts/presets/sunsky/mountain.py
branches/soc-2010-merwin/release/scripts/templates/operator.py
branches/soc-2010-merwin/release/scripts/templates/operator_modal.py
branches/soc-2010-merwin/release/scripts/templates/operator_modal_draw.py
branches/soc-2010-merwin/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-merwin/release/scripts/templates/operator_uv.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_armature.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_bone.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_curve.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-merwin/release/scripts/ui/properties_game.py
branches/soc-2010-merwin/release/scripts/ui/properties_material.py
branches/soc-2010-merwin/release/scripts/ui/properties_object.py
branches/soc-2010-merwin/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-merwin/release/scripts/ui/properties_particle.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_common.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-merwin/release/scripts/ui/properties_render.py
branches/soc-2010-merwin/release/scripts/ui/properties_scene.py
branches/soc-2010-merwin/release/scripts/ui/properties_texture.py
branches/soc-2010-merwin/release/scripts/ui/properties_world.py
branches/soc-2010-merwin/release/scripts/ui/space_image.py
branches/soc-2010-merwin/release/scripts/ui/space_info.py
branches/soc-2010-merwin/release/scripts/ui/space_logic.py
branches/soc-2010-merwin/release/scripts/ui/space_node.py
branches/soc-2010-merwin/release/scripts/ui/space_sequencer.py
branches/soc-2010-merwin/release/scripts/ui/space_text.py
branches/soc-2010-merwin/release/scripts/ui/space_time.py
branches/soc-2010-merwin/release/scripts/ui/space_userpref.py
branches/soc-2010-merwin/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-merwin/release/scripts/ui/space_view3d.py
branches/soc-2010-merwin/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-merwin/release/text/readme.html
branches/soc-2010-merwin/source/Makefile
branches/soc-2010-merwin/source/blender/avi/AVI_avi.h
branches/soc-2010-merwin/source/blender/blenfont/intern/blf_lang.c
branches/soc-2010-merwin/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_displist.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_idprop.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_image.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_key.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_lattice.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_library.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_mball.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_node.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_object.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_paint.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_particle.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_sca.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_softbody.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_sound.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-merwin/source/blender/blenkernel/SConscript
branches/soc-2010-merwin/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2010-merwin/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/action.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/anim.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/armature.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/blender.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/brush.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/collision.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/curve.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/displist.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/effect.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/exotic.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/font.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/group.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/icons.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/idprop.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/image.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/ipo.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/key.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/library.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/material.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/mball.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/multires.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/node.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/object.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/particle.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/report.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/sca.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/scene.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/sound.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/texture.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/world.c
branches/soc-2010-merwin/source/blender/blenlib/BLI_linklist.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_math_base.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_math_inline.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_pbvh.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_rect.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_uvproject.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_winstuff.h
branches/soc-2010-merwin/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-merwin/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2010-merwin/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2010-merwin/source/blender/blenlib/intern/bpath.c
branches/soc-2010-merwin/source/blender/blenlib/intern/fileops.c
branches/soc-2010-merwin/source/blender/blenlib/intern/math_color.c
branches/soc-2010-merwin/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-merwin/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-merwin/source/blender/blenlib/intern/noise.c
branches/soc-2010-merwin/source/blender/blenlib/intern/path_util.c
branches/soc-2010-merwin/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-merwin/source/blender/blenlib/intern/rct.c
branches/soc-2010-merwin/source/blender/blenlib/intern/scanfill.c
branches/soc-2010-merwin/source/blender/blenlib/intern/storage.c
branches/soc-2010-merwin/source/blender/blenlib/intern/threads.c
branches/soc-2010-merwin/source/blender/blenlib/intern/uvproject.c
branches/soc-2010-merwin/source/blender/blenloader/intern/readfile.c
branches/soc-2010-merwin/source/blender/blenloader/intern/writefile.c
branches/soc-2010-merwin/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-merwin/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-merwin/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_deps.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_filter.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_markers.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_ops.c
branches/soc-2010-merwin/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2010-merwin/source/blender/editors/animation/keyframes_draw.c
branches/soc-2010-merwin/source/blender/editors/animation/keyframing.c
branches/soc-2010-merwin/source/blender/editors/animation/keyingsets.c
branches/soc-2010-merwin/source/blender/editors/armature/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/armature/Makefile
branches/soc-2010-merwin/source/blender/editors/armature/SConscript
branches/soc-2010-merwin/source/blender/editors/armature/armature_intern.h
branches/soc-2010-merwin/source/blender/editors/armature/armature_ops.c
branches/soc-2010-merwin/source/blender/editors/armature/editarmature.c
branches/soc-2010-merwin/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-merwin/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-merwin/source/blender/editors/armature/meshlaplacian.h
branches/soc-2010-merwin/source/blender/editors/armature/poselib.c
branches/soc-2010-merwin/source/blender/editors/armature/poseobject.c
branches/soc-2010-merwin/source/blender/editors/curve/curve_intern.h
branches/soc-2010-merwin/source/blender/editors/curve/curve_ops.c
branches/soc-2010-merwin/source/blender/editors/curve/editcurve.c
branches/soc-2010-merwin/source/blender/editors/curve/editfont.c
branches/soc-2010-merwin/source/blender/editors/datafiles/SConscript
branches/soc-2010-merwin/source/blender/editors/datafiles/splash.png.c
branches/soc-2010-merwin/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2010-merwin/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2010-merwin/source/blender/editors/include/ED_anim_api.h
branches/soc-2010-merwin/source/blender/editors/include/ED_armature.h
branches/soc-2010-merwin/source/blender/editors/include/ED_datafiles.h
branches/soc-2010-merwin/source/blender/editors/include/ED_keyframing.h
branches/soc-2010-merwin/source/blender/editors/include/ED_object.h
branches/soc-2010-merwin/source/blender/editors/include/ED_render.h
branches/soc-2010-merwin/source/blender/editors/include/ED_screen.h
branches/soc-2010-merwin/source/blender/editors/include/ED_screen_types.h
branches/soc-2010-merwin/source/blender/editors/include/ED_sculpt.h
branches/soc-2010-merwin/source/blender/editors/include/UI_interface.h
branches/soc-2010-merwin/source/blender/editors/interface/interface.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_anim.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_icons.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_intern.h
branches/soc-2010-merwin/source/blender/editors/interface/interface_layout.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_ops.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_panel.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_regions.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_style.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_templates.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-merwin/source/blender/editors/interface/resources.c
branches/soc-2010-merwin/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-merwin/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-merwin/source/blender/editors/mesh/mesh_intern.h
branches/soc-2010-merwin/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-merwin/source/blender/editors/mesh/meshtools.c
branches/soc-2010-merwin/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-merwin/source/blender/editors/metaball/mball_ops.c
branches/soc-2010-merwin/source/blender/editors/object/object_add.c
branches/soc-2010-merwin/source/blender/editors/object/object_constraint.c
branches/soc-2010-merwin/source/blender/editors/object/object_edit.c
branches/soc-2010-merwin/source/blender/editors/object/object_intern.h
branches/soc-2010-merwin/source/blender/editors/object/object_modifier.c
branches/soc-2010-merwin/source/blender/editors/object/object_ops.c
branches/soc-2010-merwin/source/blender/editors/object/object_relations.c
branches/soc-2010-merwin/source/blender/editors/object/object_select.c
branches/soc-2010-merwin/source/blender/editors/object/object_transform.c
branches/soc-2010-merwin/source/blender/editors/object/object_vgroup.c
branches/soc-2010-merwin/source/blender/editors/physics/particle_edit.c
branches/soc-2010-merwin/source/blender/editors/physics/particle_object.c
branches/soc-2010-merwin/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-merwin/source/blender/editors/physics/physics_ops.c
branches/soc-2010-merwin/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-merwin/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/render/render_internal.c
branches/soc-2010-merwin/source/blender/editors/render/render_opengl.c
branches/soc-2010-merwin/source/blender/editors/render/render_preview.c
branches/soc-2010-merwin/source/blender/editors/render/render_shading.c
branches/soc-2010-merwin/source/blender/editors/screen/area.c
branches/soc-2010-merwin/source/blender/editors/screen/screen_context.c
branches/soc-2010-merwin/source/blender/editors/screen/screen_edit.c
branches/soc-2010-merwin/source/blender/editors/screen/screen_intern.h
branches/soc-2010-merwin/source/blender/editors/screen/screen_ops.c
branches/soc-2010-merwin/source/blender/editors/screen/screendump.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/SConscript
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-merwin/source/blender/editors/sound/sound_ops.c
branches/soc-2010-merwin/source/blender/editors/space_action/action_edit.c
branches/soc-2010-merwin/source/blender/editors/space_action/action_ops.c
branches/soc-2010-merwin/source/blender/editors/space_action/action_select.c
branches/soc-2010-merwin/source/blender/editors/space_action/space_action.c
branches/soc-2010-merwin/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-merwin/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-merwin/source/blender/editors/space_console/space_console.c
branches/soc-2010-merwin/source/blender/editors/space_file/file_ops.c
branches/soc-2010-merwin/source/blender/editors/space_file/file_panels.c
branches/soc-2010-merwin/source/blender/editors/space_file/filelist.c
branches/soc-2010-merwin/source/blender/editors/space_file/filesel.c
branches/soc-2010-merwin/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-merwin/source/blender/editors/space_file/fsmenu.h
branches/soc-2010-merwin/source/blender/editors/space_file/space_file.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-merwin/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-merwin/source/blender/editors/space_image/SConscript
branches/soc-2010-merwin/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-merwin/source/blender/editors/space_image/image_draw.c
branches/soc-2010-merwin/source/blender/editors/space_image/image_ops.c
branches/soc-2010-merwin/source/blender/editors/space_image/space_image.c
branches/soc-2010-merwin/source/blender/editors/space_info/info_ops.c
branches/soc-2010-merwin/source/blender/editors/space_info/space_info.c
branches/soc-2010-merwin/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-merwin/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_ops.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-merwin/source/blender/editors/space_node/drawnode.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_draw.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_edit.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_intern.h
branches/soc-2010-merwin/source/blender/editors/space_node/node_ops.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_select.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_state.c
branches/soc-2010-merwin/source/blender/editors/space_node/space_node.c
branches/soc-2010-merwin/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-merwin/source/blender/editors/space_script/script_edit.c
branches/soc-2010-merwin/source/blender/editors/space_script/script_ops.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-merwin/source/blender/editors/space_text/space_text.c
branches/soc-2010-merwin/source/blender/editors/space_text/text_draw.c
branches/soc-2010-merwin/source/blender/editors/space_text/text_ops.c
branches/soc-2010-merwin/source/blender/editors/space_time/space_time.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-merwin/source/blender/editors/transform/transform.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_generics.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_input.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_ops.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_snap.c
branches/soc-2010-merwin/source/blender/editors/util/ed_util.c
branches/soc-2010-merwin/source/blender/editors/util/undo.c
branches/soc-2010-merwin/source/blender/gpu/GPU_extensions.h
branches/soc-2010-merwin/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-merwin/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-merwin/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-merwin/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-merwin/source/blender/imbuf/intern/anim.c
branches/soc-2010-merwin/source/blender/imbuf/intern/divers.c
branches/soc-2010-merwin/source/blender/imbuf/intern/imageprocess.c
branches/soc-2010-merwin/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-merwin/source/blender/imbuf/intern/png.c
branches/soc-2010-merwin/source/blender/imbuf/intern/targa.c
branches/soc-2010-merwin/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2010-merwin/source/blender/makesdna/DNA_ID.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_armature_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_camera_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_color_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_screen_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_world_types.h
branches/soc-2010-merwin/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2010-merwin/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-merwin/source/blender/makesrna/RNA_access.h
branches/soc-2010-merwin/source/blender/makesrna/SConscript
branches/soc-2010-merwin/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-merwin/source/blender/makesrna/intern/Makefile
branches/soc-2010-merwin/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_camera.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_group.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_nla.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_screen.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sound.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_text.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_build.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_util.c
branches/soc-2010-merwin/source/blender/python/doc/blender-org/layout.html
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/default.css_t
branches/soc-2010-merwin/source/blender/python/doc/epy/Geometry.py
branches/soc-2010-merwin/source/blender/python/doc/examples/mathutils.Vector.py
branches/soc-2010-merwin/source/blender/python/doc/examples/mathutils.py
branches/soc-2010-merwin/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-merwin/source/blender/python/doc/sphinx_doc_gen.sh
branches/soc-2010-merwin/source/blender/python/generic/bgl.c
branches/soc-2010-merwin/source/blender/python/generic/blf_api.c
branches/soc-2010-merwin/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-merwin/source/blender/python/generic/geometry.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils.h
branches/soc-2010-merwin/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-merwin/source/blender/python/intern/bpy.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_app.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_driver.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_interface.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_props.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_rna.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_rna.h
branches/soc-2010-merwin/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/soc-2010-merwin/source/blender/render/CMakeLists.txt
branches/soc-2010-merwin/source/blender/render/SConscript
branches/soc-2010-merwin/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-merwin/source/blender/render/intern/include/render_types.h
branches/soc-2010-merwin/source/blender/render/intern/include/texture.h
branches/soc-2010-merwin/source/blender/render/intern/include/volume_precache.h
branches/soc-2010-merwin/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2010-merwin/source/blender/render/intern/source/convertblender.c
branches/soc-2010-merwin/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2010-merwin/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-merwin/source/blender/render/intern/source/pipeline.c
branches/soc-2010-merwin/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-merwin/source/blender/render/intern/source/rayobject_instance.c
branches/soc-2010-merwin/source/blender/render/intern/source/rayshade.c
branches/soc-2010-merwin/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-merwin/source/blender/render/intern/source/texture.c
branches/soc-2010-merwin/source/blender/render/intern/source/volume_precache.c
branches/soc-2010-merwin/source/blender/render/intern/source/volumetric.c
branches/soc-2010-merwin/source/blender/windowmanager/CMakeLists.txt
branches/soc-2010-merwin/source/blender/windowmanager/SConscript
branches/soc-2010-merwin/source/blender/windowmanager/WM_api.h
branches/soc-2010-merwin/source/blender/windowmanager/WM_types.h
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-merwin/source/blender/windowmanager/wm_event_types.h
branches/soc-2010-merwin/source/blender/windowmanager/wm_files.h
branches/soc-2010-merwin/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-merwin/source/creator/CMakeLists.txt
branches/soc-2010-merwin/source/creator/creator.c
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-merwin/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-merwin/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2010-merwin/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-merwin/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-merwin/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2010-merwin/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-merwin/source/gameengine/GamePlayer/netscape/common/npmac.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-merwin/source/gameengine/Network/NG_NetworkScene.cpp
branches/soc-2010-merwin/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2010-merwin/source/gameengine/PyDoc/VideoTexture.py
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.events.rst
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.logic.rst
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.render.rst
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.types.rst
branches/soc-2010-merwin/source/gameengine/Rasterizer/Makefile
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2010-merwin/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/soc-2010-merwin/bin/blender-thumbnailer.py
branches/soc-2010-merwin/build_files/
branches/soc-2010-merwin/build_files/cmake/
branches/soc-2010-merwin/build_files/cmake/example_scripts/
branches/soc-2010-merwin/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/soc-2010-merwin/build_files/cmake/macros.cmake
branches/soc-2010-merwin/build_files/make/
branches/soc-2010-merwin/build_files/make/example_scripts/
branches/soc-2010-merwin/build_files/make/example_scripts/linux_nanmakefiles.sh
branches/soc-2010-merwin/build_files/make/example_scripts/macos_nanmakefiles.sh
branches/soc-2010-merwin/build_files/make/example_scripts/sunos_nanmakefiles.sh
branches/soc-2010-merwin/build_files/make/nan_compile.mk
branches/soc-2010-merwin/build_files/make/nan_definitions.mk
branches/soc-2010-merwin/build_files/make/nan_link.mk
branches/soc-2010-merwin/build_files/make/nan_subdirs.mk
branches/soc-2010-merwin/build_files/make/nan_warn.mk
branches/soc-2010-merwin/build_files/scons/
branches/soc-2010-merwin/build_files/scons/config/
branches/soc-2010-merwin/build_files/scons/config/aix4-config.py
branches/soc-2010-merwin/build_files/scons/config/darwin-config.py
branches/soc-2010-merwin/build_files/scons/config/irix6-config.py
branches/soc-2010-merwin/build_files/scons/config/linux2-config.py
branches/soc-2010-merwin/build_files/scons/config/linuxcross-config.py
branches/soc-2010-merwin/build_files/scons/config/openbsd3-config.py
branches/soc-2010-merwin/build_files/scons/config/sunos5-config.py
branches/soc-2010-merwin/build_files/scons/config/win32-mingw-config.py
branches/soc-2010-merwin/build_files/scons/config/win32-vc-config.py
branches/soc-2010-merwin/build_files/scons/config/win64-vc-config.py
branches/soc-2010-merwin/build_files/scons/tools/
branches/soc-2010-merwin/build_files/scons/tools/Blender.py
branches/soc-2010-merwin/build_files/scons/tools/__init__.py
branches/soc-2010-merwin/build_files/scons/tools/bcolors.py
branches/soc-2010-merwin/build_files/scons/tools/btools.py
branches/soc-2010-merwin/build_files/scons/tools/crossmingw.py
branches/soc-2010-merwin/build_files/scons/tools/mstoolkit.py
branches/soc-2010-merwin/doc/blender.1
branches/soc-2010-merwin/doc/blender.1.py
branches/soc-2010-merwin/intern/ghost/GHOST_Path-api.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2010-merwin/release/datafiles/brushicons/
branches/soc-2010-merwin/release/datafiles/brushicons/add.png
branches/soc-2010-merwin/release/datafiles/brushicons/blob.png
branches/soc-2010-merwin/release/datafiles/brushicons/blur.png
branches/soc-2010-merwin/release/datafiles/brushicons/clay.png
branches/soc-2010-merwin/release/datafiles/brushicons/clone.png
branches/soc-2010-merwin/release/datafiles/brushicons/crease.png
branches/soc-2010-merwin/release/datafiles/brushicons/darken.png
branches/soc-2010-merwin/release/datafiles/brushicons/draw.png
branches/soc-2010-merwin/release/datafiles/brushicons/fill.png
branches/soc-2010-merwin/release/datafiles/brushicons/flatten.png
branches/soc-2010-merwin/release/datafiles/brushicons/grab.png
branches/soc-2010-merwin/release/datafiles/brushicons/inflate.png
branches/soc-2010-merwin/release/datafiles/brushicons/layer.png
branches/soc-2010-merwin/release/datafiles/brushicons/lighten.png
branches/soc-2010-merwin/release/datafiles/brushicons/mix.png
branches/soc-2010-merwin/release/datafiles/brushicons/multiply.png
branches/soc-2010-merwin/release/datafiles/brushicons/nudge.png
branches/soc-2010-merwin/release/datafiles/brushicons/pinch.png
branches/soc-2010-merwin/release/datafiles/brushicons/scrape.png
branches/soc-2010-merwin/release/datafiles/brushicons/smear.png
branches/soc-2010-merwin/release/datafiles/brushicons/smooth.png
branches/soc-2010-merwin/release/datafiles/brushicons/snake_hook.png
branches/soc-2010-merwin/release/datafiles/brushicons/soften.png
branches/soc-2010-merwin/release/datafiles/brushicons/subtract.png
branches/soc-2010-merwin/release/datafiles/brushicons/texdraw.png
branches/soc-2010-merwin/release/datafiles/brushicons/thumb.png
branches/soc-2010-merwin/release/datafiles/brushicons/twist.png
branches/soc-2010-merwin/release/datafiles/brushicons/vertexdraw.png
branches/soc-2010-merwin/release/scripts/modules/blend_render_info.py
branches/soc-2010-merwin/release/windows/installer/
branches/soc-2010-merwin/release/windows/installer/00.checked.bmp
branches/soc-2010-merwin/release/windows/installer/00.header.bmp
branches/soc-2010-merwin/release/windows/installer/00.installer.ico
branches/soc-2010-merwin/release/windows/installer/00.sconsblender.nsi
branches/soc-2010-merwin/source/blender/blenkernel/intern/seqcache.c
branches/soc-2010-merwin/source/blender/blenlib/BLI_cpu.h
branches/soc-2010-merwin/source/blender/blenlib/intern/cpu.c
branches/soc-2010-merwin/source/blender/editors/datafiles/add.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/blob.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/blur.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/clay.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/clone.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/crease.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/darken.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/draw.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/fill.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/flatten.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/grab.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/inflate.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/layer.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/lighten.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/mix.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/multiply.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/nudge.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/pinch.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/scrape.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/smear.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/smooth.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/snake_hook.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/soften.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-merwin/source/blender/editors/datafiles/subtract.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/texdraw.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/thumb.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/twist.png.c
branches/soc-2010-merwin/source/blender/editors/datafiles/vertexdraw.png.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-merwin/source/blender/gpu/GPU_buffers.h
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_actuator_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_controller_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sensor_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-merwin/source/blender/python/doc/examples/bpy.data.py
branches/soc-2010-merwin/source/blender/python/generic/noise.c
Removed Paths:
-------------
branches/soc-2010-merwin/CMake/
branches/soc-2010-merwin/build_files/cmake/
branches/soc-2010-merwin/build_files/cmake/example_scripts/
branches/soc-2010-merwin/build_files/cmake/example_scripts/cmake_linux_install.sh
branches/soc-2010-merwin/build_files/cmake/macros.cmake
branches/soc-2010-merwin/build_files/make/
branches/soc-2010-merwin/build_files/make/example_scripts/
branches/soc-2010-merwin/build_files/make/example_scripts/linux_nanmakefiles.sh
branches/soc-2010-merwin/build_files/make/example_scripts/macos_nanmakefiles.sh
branches/soc-2010-merwin/build_files/make/example_scripts/sunos_nanmakefiles.sh
branches/soc-2010-merwin/build_files/make/nan_compile.mk
branches/soc-2010-merwin/build_files/make/nan_definitions.mk
branches/soc-2010-merwin/build_files/make/nan_link.mk
branches/soc-2010-merwin/build_files/make/nan_subdirs.mk
branches/soc-2010-merwin/build_files/make/nan_warn.mk
branches/soc-2010-merwin/build_files/scons/
branches/soc-2010-merwin/build_files/scons/config/
branches/soc-2010-merwin/build_files/scons/config/aix4-config.py
branches/soc-2010-merwin/build_files/scons/config/darwin-config.py
branches/soc-2010-merwin/build_files/scons/config/irix6-config.py
branches/soc-2010-merwin/build_files/scons/config/linux2-config.py
branches/soc-2010-merwin/build_files/scons/config/linuxcross-config.py
branches/soc-2010-merwin/build_files/scons/config/openbsd3-config.py
branches/soc-2010-merwin/build_files/scons/config/sunos5-config.py
branches/soc-2010-merwin/build_files/scons/config/win32-mingw-config.py
branches/soc-2010-merwin/build_files/scons/config/win32-vc-config.py
branches/soc-2010-merwin/build_files/scons/config/win64-vc-config.py
branches/soc-2010-merwin/build_files/scons/tools/
branches/soc-2010-merwin/build_files/scons/tools/Blender.py
branches/soc-2010-merwin/build_files/scons/tools/__init__.py
branches/soc-2010-merwin/build_files/scons/tools/bcolors.py
branches/soc-2010-merwin/build_files/scons/tools/btools.py
branches/soc-2010-merwin/build_files/scons/tools/crossmingw.py
branches/soc-2010-merwin/build_files/scons/tools/mstoolkit.py
branches/soc-2010-merwin/config/
branches/soc-2010-merwin/make/
branches/soc-2010-merwin/release/datafiles/brushicons/add.png
branches/soc-2010-merwin/release/datafiles/brushicons/blob.png
branches/soc-2010-merwin/release/datafiles/brushicons/blur.png
branches/soc-2010-merwin/release/datafiles/brushicons/clay.png
branches/soc-2010-merwin/release/datafiles/brushicons/clone.png
branches/soc-2010-merwin/release/datafiles/brushicons/crease.png
branches/soc-2010-merwin/release/datafiles/brushicons/darken.png
branches/soc-2010-merwin/release/datafiles/brushicons/draw.png
branches/soc-2010-merwin/release/datafiles/brushicons/fill.png
branches/soc-2010-merwin/release/datafiles/brushicons/flatten.png
branches/soc-2010-merwin/release/datafiles/brushicons/grab.png
branches/soc-2010-merwin/release/datafiles/brushicons/inflate.png
branches/soc-2010-merwin/release/datafiles/brushicons/layer.png
branches/soc-2010-merwin/release/datafiles/brushicons/lighten.png
branches/soc-2010-merwin/release/datafiles/brushicons/mix.png
branches/soc-2010-merwin/release/datafiles/brushicons/multiply.png
branches/soc-2010-merwin/release/datafiles/brushicons/nudge.png
branches/soc-2010-merwin/release/datafiles/brushicons/pinch.png
branches/soc-2010-merwin/release/datafiles/brushicons/scrape.png
branches/soc-2010-merwin/release/datafiles/brushicons/smear.png
branches/soc-2010-merwin/release/datafiles/brushicons/smooth.png
branches/soc-2010-merwin/release/datafiles/brushicons/snake_hook.png
branches/soc-2010-merwin/release/datafiles/brushicons/soften.png
branches/soc-2010-merwin/release/datafiles/brushicons/subtract.png
branches/soc-2010-merwin/release/datafiles/brushicons/texdraw.png
branches/soc-2010-merwin/release/datafiles/brushicons/thumb.png
branches/soc-2010-merwin/release/datafiles/brushicons/twist.png
branches/soc-2010-merwin/release/datafiles/brushicons/vertexdraw.png
branches/soc-2010-merwin/release/windows/inno/
branches/soc-2010-merwin/release/windows/installer/00.checked.bmp
branches/soc-2010-merwin/release/windows/installer/00.header.bmp
branches/soc-2010-merwin/release/windows/installer/00.installer.ico
branches/soc-2010-merwin/release/windows/installer/00.sconsblender.nsi
branches/soc-2010-merwin/source/blender/editors/datafiles/B.blend.c
branches/soc-2010-merwin/source/blender/gpu/gpu_buffers.h
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-merwin/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-merwin/source/nan_compile.mk
branches/soc-2010-merwin/source/nan_definitions.mk
branches/soc-2010-merwin/source/nan_link.mk
branches/soc-2010-merwin/source/nan_subdirs.mk
branches/soc-2010-merwin/source/nan_warn.mk
Property Changed:
----------------
branches/soc-2010-merwin/release/scripts/io/import_scene_3ds.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_curve.py
branches/soc-2010-merwin/release/scripts/ui/properties_object.py
branches/soc-2010-merwin/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_common.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-merwin/release/scripts/ui/properties_render.py
branches/soc-2010-merwin/release/scripts/ui/properties_scene.py
branches/soc-2010-merwin/release/scripts/ui/space_userpref.py
Modified: branches/soc-2010-merwin/CMakeLists.txt
===================================================================
--- branches/soc-2010-merwin/CMakeLists.txt 2010-07-25 08:45:19 UTC (rev 30713)
+++ branches/soc-2010-merwin/CMakeLists.txt 2010-07-25 10:09:17 UTC (rev 30714)
@@ -43,6 +43,10 @@
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+# quiet output for Makefiles, 'make -s' helps too
+# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+
PROJECT(Blender)
#-----------------------------------------------------------------------------
@@ -51,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)
@@ -106,11 +112,11 @@
OPTION(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
# Misc
-OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" OFF)
+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)
+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)
@@ -124,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)
@@ -136,15 +144,10 @@
# 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(NOT OPENAL_FOUND)
@@ -166,21 +169,24 @@
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
@@ -222,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)
@@ -249,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)
@@ -298,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
@@ -323,10 +340,12 @@
ADD_DEFINITIONS(-DWIN32)
- SET(ICONV ${LIBDIR}/iconv)
- SET(ICONV_INC ${ICONV}/include)
- SET(ICONV_LIB iconv)
- SET(ICONV_LIBPATH ${ICONV}/lib)
+ IF(WITH_INTERNATIONAL)
+ SET(ICONV ${LIBDIR}/iconv)
+ SET(ICONV_INC ${ICONV}/include)
+ SET(ICONV_LIB iconv)
+ SET(ICONV_LIBPATH ${ICONV}/lib)
+ ENDIF(WITH_INTERNATIONAL)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
@@ -380,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 )
@@ -404,14 +428,16 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
ENDIF(WITH_OPENMP)
- SET(GETTEXT ${LIBDIR}/gettext)
- SET(GETTEXT_INC ${GETTEXT}/include)
- SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
- IF(CMAKE_CL_64)
- SET(GETTEXT_LIB gettext)
- ELSE(CMAKE_CL_64)
- SET(GETTEXT_LIB gnu_gettext)
- ENDIF(CMAKE_CL_64)
+ IF(WITH_INTERNATIONAL)
+ SET(GETTEXT ${LIBDIR}/gettext)
+ SET(GETTEXT_INC ${GETTEXT}/include)
+ SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+ IF(CMAKE_CL_64)
+ SET(GETTEXT_LIB gettext)
+ ELSE(CMAKE_CL_64)
+ SET(GETTEXT_LIB gnu_gettext)
+ ENDIF(CMAKE_CL_64)
+ ENDIF(WITH_INTERNATIONAL)
IF(CMAKE_CL_64)
SET(PNG_LIBRARIES libpng)
@@ -457,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)
@@ -506,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 ")
@@ -526,12 +552,14 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
- SET(GETTEXT ${LIBDIR}/gcc/gettext)
- SET(GETTEXT_INC ${GETTEXT}/include)
- SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
- SET(GETTEXT_LIB intl)
+ IF(WITH_INTERNATIONAL)
+ SET(GETTEXT ${LIBDIR}/gcc/gettext)
+ SET(GETTEXT_INC ${GETTEXT}/include)
+ SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+ SET(GETTEXT_LIB intl)
+ ENDIF(WITH_INTERNATIONAL)
- SET(JPEG_LIBRARY jpeg)
+ SET(JPEG_LIBRARY libjpeg)
SET(PNG_LIBRARIES png)
SET(ZLIB ${LIBDIR}/zlib)
@@ -577,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)
@@ -598,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)
@@ -695,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)
@@ -772,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")
@@ -818,11 +864,12 @@
#-----------------------------------------------------------------------------
# Common.
+IF(WITH_OPENJPEG)
+ set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+ set(OPENJPEG_INC ${OPENJPEG})
+ set(OPENJPEG_LIb extern_libopenjpeg)
+ENDIF(WITH_OPENJPEG)
-set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
-set(OPENJPEG_INC ${OPENJPEG})
-set(OPENJPEG_LIb extern_libopenjpeg)
-
#-----------------------------------------------------------------------------
# Blender WebPlugin
Modified: branches/soc-2010-merwin/Makefile
===================================================================
--- branches/soc-2010-merwin/Makefile 2010-07-25 08:45:19 UTC (rev 30713)
+++ branches/soc-2010-merwin/Makefile 2010-07-25 10:09:17 UTC (rev 30714)
@@ -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-merwin/SConstruct
===================================================================
--- branches/soc-2010-merwin/SConstruct 2010-07-25 08:45:19 UTC (rev 30713)
+++ branches/soc-2010-merwin/SConstruct 2010-07-25 10:09:17 UTC (rev 30714)
@@ -46,16 +46,23 @@
import re
from tempfile import mkdtemp
-import tools.Blender
-import tools.btools
-import tools.bcolors
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list