[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30296] branches/soc-2010-nicks: synched with trunk at revision 30243

Nick Samarin nicks1987 at bigmir.net
Wed Jul 14 09:35:55 CEST 2010


Revision: 30296
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30296
Author:   nicks
Date:     2010-07-14 09:35:39 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
synched with trunk at revision 30243

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30243

Modified Paths:
--------------
    branches/soc-2010-nicks/CMakeLists.txt
    branches/soc-2010-nicks/SConstruct
    branches/soc-2010-nicks/extern/glew/include/GL/glew.h
    branches/soc-2010-nicks/extern/glew/src/glew.c
    branches/soc-2010-nicks/intern/ghost/CMakeLists.txt
    branches/soc-2010-nicks/intern/ghost/GHOST_C-api.h
    branches/soc-2010-nicks/intern/ghost/GHOST_ISystem.h
    branches/soc-2010-nicks/intern/ghost/GHOST_IWindow.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_System.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_Window.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2010-nicks/intern/ghost/intern/Makefile
    branches/soc-2010-nicks/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/soc-2010-nicks/intern/string/STR_String.h
    branches/soc-2010-nicks/projectfiles_vc9/blender/blender.vcproj
    branches/soc-2010-nicks/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2010-nicks/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2010-nicks/release/scripts/io/engine_render_pov.py
    branches/soc-2010-nicks/release/scripts/io/export_3ds.py
    branches/soc-2010-nicks/release/scripts/io/export_fbx.py
    branches/soc-2010-nicks/release/scripts/io/export_mdd.py
    branches/soc-2010-nicks/release/scripts/io/export_obj.py
    branches/soc-2010-nicks/release/scripts/io/export_ply.py
    branches/soc-2010-nicks/release/scripts/io/export_x3d.py
    branches/soc-2010-nicks/release/scripts/io/import_anim_bvh.py
    branches/soc-2010-nicks/release/scripts/io/import_scene_3ds.py
    branches/soc-2010-nicks/release/scripts/io/import_scene_obj.py
    branches/soc-2010-nicks/release/scripts/io/import_shape_mdd.py
    branches/soc-2010-nicks/release/scripts/io/netrender/client.py
    branches/soc-2010-nicks/release/scripts/io/netrender/master.py
    branches/soc-2010-nicks/release/scripts/io/netrender/operators.py
    branches/soc-2010-nicks/release/scripts/io/netrender/repath.py
    branches/soc-2010-nicks/release/scripts/io/netrender/ui.py
    branches/soc-2010-nicks/release/scripts/io/netrender/utils.py
    branches/soc-2010-nicks/release/scripts/modules/add_object_utils.py
    branches/soc-2010-nicks/release/scripts/modules/bpy/utils.py
    branches/soc-2010-nicks/release/scripts/modules/bpy_types.py
    branches/soc-2010-nicks/release/scripts/modules/graphviz_export.py
    branches/soc-2010-nicks/release/scripts/modules/rigify/__init__.py
    branches/soc-2010-nicks/release/scripts/modules/rna_info.py
    branches/soc-2010-nicks/release/scripts/modules/rna_prop_ui.py
    branches/soc-2010-nicks/release/scripts/op/console_python.py
    branches/soc-2010-nicks/release/scripts/op/image.py
    branches/soc-2010-nicks/release/scripts/op/object.py
    branches/soc-2010-nicks/release/scripts/op/object_align.py
    branches/soc-2010-nicks/release/scripts/op/presets.py
    branches/soc-2010-nicks/release/scripts/op/sequencer.py
    branches/soc-2010-nicks/release/scripts/op/uv.py
    branches/soc-2010-nicks/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2010-nicks/release/scripts/op/wm.py
    branches/soc-2010-nicks/release/scripts/presets/cloth/cotton.py
    branches/soc-2010-nicks/release/scripts/presets/cloth/denim.py
    branches/soc-2010-nicks/release/scripts/presets/cloth/leather.py
    branches/soc-2010-nicks/release/scripts/presets/cloth/rubber.py
    branches/soc-2010-nicks/release/scripts/presets/cloth/silk.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/h264.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/theora.py
    branches/soc-2010-nicks/release/scripts/presets/ffmpeg/xvid.py
    branches/soc-2010-nicks/release/scripts/presets/interaction/maya.py
    branches/soc-2010-nicks/release/scripts/presets/render/DVCPRO_HD_1080p.py
    branches/soc-2010-nicks/release/scripts/presets/render/DVCPRO_HD_720p.py
    branches/soc-2010-nicks/release/scripts/presets/render/HDTV_1080p.py
    branches/soc-2010-nicks/release/scripts/presets/render/HDTV_720p.py
    branches/soc-2010-nicks/release/scripts/presets/render/HDV_1080p.py
    branches/soc-2010-nicks/release/scripts/presets/render/TV_NTSC_16_colon_9.py
    branches/soc-2010-nicks/release/scripts/presets/render/TV_NTSC_4_colon_3.py
    branches/soc-2010-nicks/release/scripts/presets/render/TV_PAL_16_colon_9.py
    branches/soc-2010-nicks/release/scripts/presets/render/TV_PAL_4_colon_3.py
    branches/soc-2010-nicks/release/scripts/presets/sss/apple.py
    branches/soc-2010-nicks/release/scripts/presets/sss/chicken.py
    branches/soc-2010-nicks/release/scripts/presets/sss/cream.py
    branches/soc-2010-nicks/release/scripts/presets/sss/ketchup.py
    branches/soc-2010-nicks/release/scripts/presets/sss/marble.py
    branches/soc-2010-nicks/release/scripts/presets/sss/potato.py
    branches/soc-2010-nicks/release/scripts/presets/sss/skim_milk.py
    branches/soc-2010-nicks/release/scripts/presets/sss/skin1.py
    branches/soc-2010-nicks/release/scripts/presets/sss/skin2.py
    branches/soc-2010-nicks/release/scripts/presets/sss/whole_milk.py
    branches/soc-2010-nicks/release/scripts/presets/sunsky/classic.py
    branches/soc-2010-nicks/release/scripts/presets/sunsky/desert.py
    branches/soc-2010-nicks/release/scripts/presets/sunsky/mountain.py
    branches/soc-2010-nicks/release/scripts/templates/operator.py
    branches/soc-2010-nicks/release/scripts/templates/operator_modal.py
    branches/soc-2010-nicks/release/scripts/templates/operator_modal_draw.py
    branches/soc-2010-nicks/release/scripts/templates/operator_modal_view3d.py
    branches/soc-2010-nicks/release/scripts/templates/operator_uv.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_armature.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-nicks/release/scripts/ui/properties_game.py
    branches/soc-2010-nicks/release/scripts/ui/properties_object.py
    branches/soc-2010-nicks/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-nicks/release/scripts/ui/properties_particle.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2010-nicks/release/scripts/ui/properties_render.py
    branches/soc-2010-nicks/release/scripts/ui/properties_scene.py
    branches/soc-2010-nicks/release/scripts/ui/properties_texture.py
    branches/soc-2010-nicks/release/scripts/ui/space_image.py
    branches/soc-2010-nicks/release/scripts/ui/space_info.py
    branches/soc-2010-nicks/release/scripts/ui/space_logic.py
    branches/soc-2010-nicks/release/scripts/ui/space_node.py
    branches/soc-2010-nicks/release/scripts/ui/space_sequencer.py
    branches/soc-2010-nicks/release/scripts/ui/space_text.py
    branches/soc-2010-nicks/release/scripts/ui/space_time.py
    branches/soc-2010-nicks/release/scripts/ui/space_userpref.py
    branches/soc-2010-nicks/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2010-nicks/release/scripts/ui/space_view3d.py
    branches/soc-2010-nicks/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-nicks/source/Makefile
    branches/soc-2010-nicks/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_displist.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_image.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_key.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_mball.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_node.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_paint.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_report.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_sca.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_softbody.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_subsurf.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_texture.h
    branches/soc-2010-nicks/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/blenkernel/SConscript
    branches/soc-2010-nicks/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2010-nicks/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/action.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/armature.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/collision.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/customdata.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/effect.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/exotic.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/group.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/idprop.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/image.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/ipo.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/key.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/lattice.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/library.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/mesh.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/node.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/object.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/report.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sca.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/softbody.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sound.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/text.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-nicks/source/blender/blenlib/BLI_fileops.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_linklist.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_math_base.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_math_inline.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_rect.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_uvproject.h
    branches/soc-2010-nicks/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/BLI_bfile.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/BLI_linklist.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/noise.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/rct.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/threads.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/uvproject.c
    branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicks/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-nicks/source/blender/collada/DocumentExporter.cpp
    branches/soc-2010-nicks/source/blender/collada/DocumentExporter.h
    branches/soc-2010-nicks/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-nicks/source/blender/collada/DocumentImporter.h
    branches/soc-2010-nicks/source/blender/collada/SConscript
    branches/soc-2010-nicks/source/blender/collada/collada.cpp
    branches/soc-2010-nicks/source/blender/collada/collada.h
    branches/soc-2010-nicks/source/blender/collada/collada_internal.h
    branches/soc-2010-nicks/source/blender/editors/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_deps.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_filter.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-nicks/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2010-nicks/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2010-nicks/source/blender/editors/animation/keyframing.c
    branches/soc-2010-nicks/source/blender/editors/animation/keyingsets.c
    branches/soc-2010-nicks/source/blender/editors/armature/Makefile
    branches/soc-2010-nicks/source/blender/editors/armature/SConscript
    branches/soc-2010-nicks/source/blender/editors/armature/armature_intern.h
    branches/soc-2010-nicks/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-nicks/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2010-nicks/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2010-nicks/source/blender/editors/armature/meshlaplacian.h
    branches/soc-2010-nicks/source/blender/editors/armature/poselib.c
    branches/soc-2010-nicks/source/blender/editors/curve/curve_intern.h
    branches/soc-2010-nicks/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-nicks/source/blender/editors/curve/editcurve.c
    branches/soc-2010-nicks/source/blender/editors/curve/editfont.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/B.blend.c
    branches/soc-2010-nicks/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2010-nicks/source/blender/editors/include/ED_anim_api.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_armature.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_keyframing.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_object.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_render.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_screen.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_screen_types.h
    branches/soc-2010-nicks/source/blender/editors/include/ED_view3d.h
    branches/soc-2010-nicks/source/blender/editors/include/UI_interface.h
    branches/soc-2010-nicks/source/blender/editors/interface/interface_anim.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_icons.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_intern.h
    branches/soc-2010-nicks/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_ops.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_panel.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-nicks/source/blender/editors/interface/view2d_ops.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-nicks/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-nicks/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2010-nicks/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2010-nicks/source/blender/editors/mesh/meshtools.c
    branches/soc-2010-nicks/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-nicks/source/blender/editors/object/object_add.c
    branches/soc-2010-nicks/source/blender/editors/object/object_constraint.c
    branches/soc-2010-nicks/source/blender/editors/object/object_edit.c
    branches/soc-2010-nicks/source/blender/editors/object/object_intern.h
    branches/soc-2010-nicks/source/blender/editors/object/object_modifier.c
    branches/soc-2010-nicks/source/blender/editors/object/object_ops.c
    branches/soc-2010-nicks/source/blender/editors/object/object_relations.c
    branches/soc-2010-nicks/source/blender/editors/object/object_transform.c
    branches/soc-2010-nicks/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-nicks/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-nicks/source/blender/editors/physics/particle_object.c
    branches/soc-2010-nicks/source/blender/editors/physics/physics_fluid.c
    branches/soc-2010-nicks/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2010-nicks/source/blender/editors/render/render_internal.c
    branches/soc-2010-nicks/source/blender/editors/render/render_opengl.c
    branches/soc-2010-nicks/source/blender/editors/render/render_preview.c
    branches/soc-2010-nicks/source/blender/editors/render/render_shading.c
    branches/soc-2010-nicks/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/screen/SConscript
    branches/soc-2010-nicks/source/blender/editors/screen/area.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_context.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nicks/source/blender/editors/screen/screendump.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-nicks/source/blender/editors/sound/SConscript
    branches/soc-2010-nicks/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_action/action_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_action/action_select.c
    branches/soc-2010-nicks/source/blender/editors/space_action/space_action.c
    branches/soc-2010-nicks/source/blender/editors/space_api/SConscript
    branches/soc-2010-nicks/source/blender/editors/space_buttons/SConscript
    branches/soc-2010-nicks/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2010-nicks/source/blender/editors/space_console/space_console.c
    branches/soc-2010-nicks/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_file/file_panels.c
    branches/soc-2010-nicks/source/blender/editors/space_file/filelist.c
    branches/soc-2010-nicks/source/blender/editors/space_file/filesel.c
    branches/soc-2010-nicks/source/blender/editors/space_file/fsmenu.c
    branches/soc-2010-nicks/source/blender/editors/space_file/fsmenu.h
    branches/soc-2010-nicks/source/blender/editors/space_file/space_file.c
    branches/soc-2010-nicks/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_graph/graph_select.c
    branches/soc-2010-nicks/source/blender/editors/space_graph/space_graph.c
    branches/soc-2010-nicks/source/blender/editors/space_image/SConscript
    branches/soc-2010-nicks/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-nicks/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_image/space_image.c
    branches/soc-2010-nicks/source/blender/editors/space_info/SConscript
    branches/soc-2010-nicks/source/blender/editors/space_info/info_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_info/space_info.c
    branches/soc-2010-nicks/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_select.c
    branches/soc-2010-nicks/source/blender/editors/space_node/drawnode.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_select.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_state.c
    branches/soc-2010-nicks/source/blender/editors/space_node/space_node.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-nicks/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_script/script_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_script/script_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_script/space_script.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-nicks/source/blender/editors/space_text/space_text.c
    branches/soc-2010-nicks/source/blender/editors/space_text/text_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_time/space_time.c
    branches/soc-2010-nicks/source/blender/editors/space_userpref/SConscript
    branches/soc-2010-nicks/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_generics.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_ops.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_snap.c
    branches/soc-2010-nicks/source/blender/editors/util/ed_util.c
    branches/soc-2010-nicks/source/blender/gpu/GPU_extensions.h
    branches/soc-2010-nicks/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2010-nicks/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2010-nicks/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2010-nicks/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2010-nicks/source/blender/imbuf/intern/IMB_filetype.h
    branches/soc-2010-nicks/source/blender/imbuf/intern/anim.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/divers.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/filetype.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-nicks/source/blender/imbuf/intern/targa.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/thumbs.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-nicks/source/blender/makesdna/DNA_ID.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_action_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_node_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2010-nicks/source/blender/makesrna/RNA_access.h
    branches/soc-2010-nicks/source/blender/makesrna/RNA_types.h
    branches/soc-2010-nicks/source/blender/makesrna/SConscript
    branches/soc-2010-nicks/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_action.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_group.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_image.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_main.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_text.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_vfont.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/soc-2010-nicks/source/blender/python/doc/blender-org/layout.html
    branches/soc-2010-nicks/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-nicks/source/blender/python/doc/examples/mathutils.Vector.py
    branches/soc-2010-nicks/source/blender/python/doc/examples/mathutils.py
    branches/soc-2010-nicks/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-nicks/source/blender/python/doc/sphinx_doc_gen.sh
    branches/soc-2010-nicks/source/blender/python/generic/bgl.c
    branches/soc-2010-nicks/source/blender/python/generic/blf_api.c
    branches/soc-2010-nicks/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-nicks/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2010-nicks/source/blender/python/generic/geometry.c
    branches/soc-2010-nicks/source/blender/python/generic/mathutils.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_driver.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_props.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_props.h
    branches/soc-2010-nicks/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-nicks/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/soc-2010-nicks/source/blender/render/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2010-nicks/source/blender/render/intern/include/render_types.h
    branches/soc-2010-nicks/source/blender/render/intern/include/texture.h
    branches/soc-2010-nicks/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-nicks/source/blender/render/intern/source/imagetexture.c
    branches/soc-2010-nicks/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-nicks/source/blender/render/intern/source/pointdensity.c
    branches/soc-2010-nicks/source/blender/render/intern/source/rayobject_instance.c
    branches/soc-2010-nicks/source/blender/render/intern/source/rayshade.c
    branches/soc-2010-nicks/source/blender/render/intern/source/texture.c
    branches/soc-2010-nicks/source/blender/render/intern/source/voxeldata.c
    branches/soc-2010-nicks/source/blender/windowmanager/WM_api.h
    branches/soc-2010-nicks/source/blender/windowmanager/WM_types.h
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-nicks/source/blender/windowmanager/wm_event_types.h
    branches/soc-2010-nicks/source/blender/windowmanager/wm_files.h
    branches/soc-2010-nicks/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2010-nicks/source/creator/CMakeLists.txt
    branches/soc-2010-nicks/source/creator/creator.c
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2010-nicks/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/soc-2010-nicks/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2010-nicks/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2010-nicks/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2010-nicks/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2010-nicks/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2010-nicks/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2010-nicks/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2010-nicks/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2010-nicks/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2010-nicks/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/soc-2010-nicks/source/gameengine/Expressions/BoolValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/ConstExpr.h
    branches/soc-2010-nicks/source/gameengine/Expressions/EmptyValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/ErrorValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/Expression.h
    branches/soc-2010-nicks/source/gameengine/Expressions/FloatValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/IdentifierExpr.h
    branches/soc-2010-nicks/source/gameengine/Expressions/IfExpr.h
    branches/soc-2010-nicks/source/gameengine/Expressions/InputParser.h
    branches/soc-2010-nicks/source/gameengine/Expressions/IntValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/KX_HashedPtr.h
    branches/soc-2010-nicks/source/gameengine/Expressions/Operator1Expr.h
    branches/soc-2010-nicks/source/gameengine/Expressions/Operator2Expr.h
    branches/soc-2010-nicks/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2010-nicks/source/gameengine/Expressions/StringValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/Value.h
    branches/soc-2010-nicks/source/gameengine/Expressions/VectorValue.h
    branches/soc-2010-nicks/source/gameengine/Expressions/VoidValue.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_BasicEventManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/soc-2010-nicks/source/gameengine/GamePlayer/netscape/common/npmac.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/BL_Texture.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_EmptyObject.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ISystem.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_MotionState.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PositionInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_RayCast.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ScalarInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_ScalingInterpolator.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2010-nicks/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
    branches/soc-2010-nicks/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2010-nicks/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2010-nicks/source/gameengine/Network/NG_NetworkMessage.h
    branches/soc-2010-nicks/source/gameengine/Network/NG_NetworkObject.h
    branches/soc-2010-nicks/source/gameengine/Network/NG_NetworkScene.h
    branches/soc-2010-nicks/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h
    branches/soc-2010-nicks/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2010-nicks/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2010-nicks/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2010-nicks/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2010-nicks/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2010-nicks/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2010-nicks/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2010-nicks/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2010-nicks/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2010-nicks/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.events.rst
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.render.rst
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.types.rst
    branches/soc-2010-nicks/source/gameengine/Rasterizer/Makefile
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_Rect.h
    branches/soc-2010-nicks/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_BBox.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_Controller.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_Node.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_Spatial.h
    branches/soc-2010-nicks/source/gameengine/SceneGraph/SG_Tree.h
    branches/soc-2010-nicks/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2010-nicks/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2010-nicks/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/soc-2010-nicks/source/nan_compile.mk

Added Paths:
-----------
    branches/soc-2010-nicks/build_files/
    branches/soc-2010-nicks/build_files/cmake/
    branches/soc-2010-nicks/build_files/cmake/macros.cmake
    branches/soc-2010-nicks/build_files/make/
    branches/soc-2010-nicks/build_files/make/example_scripts/
    branches/soc-2010-nicks/build_files/make/example_scripts/linux_nanmakefiles.sh
    branches/soc-2010-nicks/build_files/make/example_scripts/macos_nanmakefiles.sh
    branches/soc-2010-nicks/build_files/make/example_scripts/sunos_nanmakefiles.sh
    branches/soc-2010-nicks/build_files/scons/
    branches/soc-2010-nicks/build_files/scons/config/
    branches/soc-2010-nicks/build_files/scons/config/aix4-config.py
    branches/soc-2010-nicks/build_files/scons/config/darwin-config.py
    branches/soc-2010-nicks/build_files/scons/config/irix6-config.py
    branches/soc-2010-nicks/build_files/scons/config/linux2-config.py
    branches/soc-2010-nicks/build_files/scons/config/linuxcross-config.py
    branches/soc-2010-nicks/build_files/scons/config/openbsd3-config.py
    branches/soc-2010-nicks/build_files/scons/config/sunos5-config.py
    branches/soc-2010-nicks/build_files/scons/config/win32-mingw-config.py
    branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py
    branches/soc-2010-nicks/build_files/scons/config/win64-vc-config.py
    branches/soc-2010-nicks/build_files/scons/tools/
    branches/soc-2010-nicks/build_files/scons/tools/Blender.py
    branches/soc-2010-nicks/build_files/scons/tools/__init__.py
    branches/soc-2010-nicks/build_files/scons/tools/bcolors.py
    branches/soc-2010-nicks/build_files/scons/tools/btools.py
    branches/soc-2010-nicks/build_files/scons/tools/crossmingw.py
    branches/soc-2010-nicks/build_files/scons/tools/mstoolkit.py
    branches/soc-2010-nicks/doc/blender.1
    branches/soc-2010-nicks/doc/blender.1.py
    branches/soc-2010-nicks/intern/ghost/GHOST_Path-api.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2010-nicks/release/scripts/modules/blend_render_info.py
    branches/soc-2010-nicks/release/windows/installer/
    branches/soc-2010-nicks/release/windows/installer/00.checked.bmp
    branches/soc-2010-nicks/release/windows/installer/00.header.bmp
    branches/soc-2010-nicks/release/windows/installer/00.installer.ico
    branches/soc-2010-nicks/release/windows/installer/00.sconsblender.nsi
    branches/soc-2010-nicks/source/blender/blenlib/BLI_cpu.h
    branches/soc-2010-nicks/source/blender/blenlib/intern/cpu.c
    branches/soc-2010-nicks/source/blender/editors/animation/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/metaball/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/object/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/render/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_api/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_sound/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_userpref/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/util/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/editors/uvedit/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_actuator_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_controller_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sensor_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2010-nicks/source/blender/python/doc/examples/bpy.data.py

Removed Paths:
-------------
    branches/soc-2010-nicks/CMake/
    branches/soc-2010-nicks/build_files/cmake/
    branches/soc-2010-nicks/build_files/cmake/macros.cmake
    branches/soc-2010-nicks/build_files/make/
    branches/soc-2010-nicks/build_files/make/example_scripts/
    branches/soc-2010-nicks/build_files/make/example_scripts/linux_nanmakefiles.sh
    branches/soc-2010-nicks/build_files/make/example_scripts/macos_nanmakefiles.sh
    branches/soc-2010-nicks/build_files/make/example_scripts/sunos_nanmakefiles.sh
    branches/soc-2010-nicks/build_files/scons/
    branches/soc-2010-nicks/build_files/scons/config/
    branches/soc-2010-nicks/build_files/scons/config/aix4-config.py
    branches/soc-2010-nicks/build_files/scons/config/darwin-config.py
    branches/soc-2010-nicks/build_files/scons/config/irix6-config.py
    branches/soc-2010-nicks/build_files/scons/config/linux2-config.py
    branches/soc-2010-nicks/build_files/scons/config/linuxcross-config.py
    branches/soc-2010-nicks/build_files/scons/config/openbsd3-config.py
    branches/soc-2010-nicks/build_files/scons/config/sunos5-config.py
    branches/soc-2010-nicks/build_files/scons/config/win32-mingw-config.py
    branches/soc-2010-nicks/build_files/scons/config/win32-vc-config.py
    branches/soc-2010-nicks/build_files/scons/config/win64-vc-config.py
    branches/soc-2010-nicks/build_files/scons/tools/
    branches/soc-2010-nicks/build_files/scons/tools/Blender.py
    branches/soc-2010-nicks/build_files/scons/tools/__init__.py
    branches/soc-2010-nicks/build_files/scons/tools/bcolors.py
    branches/soc-2010-nicks/build_files/scons/tools/btools.py
    branches/soc-2010-nicks/build_files/scons/tools/crossmingw.py
    branches/soc-2010-nicks/build_files/scons/tools/mstoolkit.py
    branches/soc-2010-nicks/config/
    branches/soc-2010-nicks/make/
    branches/soc-2010-nicks/release/windows/inno/
    branches/soc-2010-nicks/release/windows/installer/00.checked.bmp
    branches/soc-2010-nicks/release/windows/installer/00.header.bmp
    branches/soc-2010-nicks/release/windows/installer/00.installer.ico
    branches/soc-2010-nicks/release/windows/installer/00.sconsblender.nsi
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2010-nicks/tools/

Modified: branches/soc-2010-nicks/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicks/CMakeLists.txt	2010-07-14 07:35:26 UTC (rev 30295)
+++ branches/soc-2010-nicks/CMakeLists.txt	2010-07-14 07:35:39 UTC (rev 30296)
@@ -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)
 
 #-----------------------------------------------------------------------------
@@ -56,55 +60,83 @@
 SET(BLENDER_VERSION  2.5)
 
 #-----------------------------------------------------------------------------
+# Load some macros.
+INCLUDE(build_files/cmake/macros.cmake)
+
+#-----------------------------------------------------------------------------
 # Set default config options
-OPTION(WITH_PLAYER        "Build Player" OFF)
-OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
-OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+
+# Blender internal features
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
+OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
+OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
+OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
+OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
+OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
+OPTION(WITH_PLAYER        "Build Player" OFF)
+# (unix defaults to OpenMP On)
+IF(UNIX AND NOT APPLE)
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+ELSE()
+	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+ENDIF()
+
+# Image format support
 OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
 OPTION(WITH_TIFF          "Enable LibTIFF Support" ON)
 OPTION(WITH_DDS           "Enable DDS Support" ON)
+
+# Audio format support
 OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_PYTHON        "Enable Embedded Python API" ON)
-OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
-OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
-OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
-OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
 OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-OPTION(WITH_LZO           "Enable fast LZO compression, used for pointcache" ON)
-OPTION(WITH_LZMA          "Enable best LZMA compression, used for pointcache" ON)
-OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
-OPTION(WITH_BUILDINFO     "Include extra build details" ON)
-OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
-
 IF(APPLE OR WIN32)
 	OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
 ENDIF(APPLE OR WIN32)
 
-# Unix defaults to OpenMP On
-# Disable opencollada on non-apple unix because opencollada has no package for debian
+# 3D format support
+# disable opencollada on non-apple unix because opencollada has no package for debian
 IF(UNIX AND NOT APPLE)
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
 	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ELSE()
-	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
 	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ENDIF()
 
-IF (APPLE)
+# Sound output
+OPTION(WITH_SDL           "Enable SDL for sound and joystick support" ON)
+OPTION(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
+OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+
+# Compression
+OPTION(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
+OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
+
+# Misc
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+
+IF(APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
-ENDIF (APPLE)
+ENDIF(APPLE)
 
+IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+	MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
+ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+TEST_SSE_SUPPORT()
+
+# disabled for now, not supported
+# OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
+
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
@@ -114,15 +146,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)
@@ -144,21 +171,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
 
@@ -179,7 +209,6 @@
 		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 	ENDIF(WITH_PYTHON)
 
-
 	IF(WITH_SDL)
 		FIND_PACKAGE(SDL)
 		# UNSET(SDLMAIN_LIBRARY CACHE)
@@ -201,15 +230,40 @@
 			/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)
+		FIND_PACKAGE(TIFF)
+		IF(NOT TIFF_FOUND)
+			SET(WITH_TIFF OFF)
+		ENDIF(NOT TIFF_FOUND)
+	ENDIF(WITH_TIFF)
+
+	FIND_PACKAGE(JPEG REQUIRED)
+
+	FIND_PACKAGE(PNG REQUIRED)
+
+	FIND_PACKAGE(ZLIB REQUIRED)
+
+	IF(WITH_LCMS)
+		SET(LCMS /usr CACHE FILEPATH "LCMS directory")
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+		SET(LCMS_LIBRARY lcms)
+		SET(LCMS_LIBPATH ${LCMS}/lib)
+	ENDIF(WITH_LCMS)
+
 	IF(WITH_FFMPEG)
 		SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
 		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)
 		SET(FFTW3 /usr)
 		SET(FFTW3_INC ${FFTW3}/include)
@@ -222,19 +276,6 @@
 	SET(LIBSAMPLERATE_LIB samplerate)
 	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-	IF(WITH_TIFF)
-		FIND_PACKAGE(TIFF)
-		IF(NOT TIFF_FOUND)
-			SET(WITH_TIFF OFF)
-		ENDIF(NOT TIFF_FOUND)
-	ENDIF(WITH_TIFF)
-
-	FIND_PACKAGE(JPEG REQUIRED)
-
-	FIND_PACKAGE(PNG REQUIRED)
-
-	FIND_PACKAGE(ZLIB REQUIRED)
-
 	IF (WITH_OPENCOLLADA)
 		SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
 		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
@@ -270,6 +311,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
@@ -295,10 +342,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)
@@ -352,6 +401,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 )
@@ -376,14 +430,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)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list