[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31746] branches/bmesh/blender: merge with trunk at r31523

Joseph Eagar joeedh at gmail.com
Sat Sep 4 07:31:29 CEST 2010


Revision: 31746
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31746
Author:   joeedh
Date:     2010-09-04 07:31:25 +0200 (Sat, 04 Sep 2010)

Log Message:
-----------
merge with trunk at r31523

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/Makefile
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/build_files/cmake/macros.cmake
    branches/bmesh/blender/build_files/make/nan_compile.mk
    branches/bmesh/blender/build_files/make/nan_definitions.mk
    branches/bmesh/blender/build_files/make/nan_link.mk
    branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/build_files/scons/tools/Blender.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/doc/blender.1.py
    branches/bmesh/blender/extern/CMakeLists.txt
    branches/bmesh/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/bmesh/blender/intern/CMakeLists.txt
    branches/bmesh/blender/intern/ghost/CMakeLists.txt
    branches/bmesh/blender/intern/ghost/SConscript
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/bmesh/blender/intern/guardedalloc/MEM_guardedalloc.h
    branches/bmesh/blender/intern/iksolver/intern/TNT/vec.h
    branches/bmesh/blender/intern/itasc/MovingFrame.cpp
    branches/bmesh/blender/intern/smoke/extern/smoke_API.h
    branches/bmesh/blender/intern/smoke/intern/FLUID_3D.cpp
    branches/bmesh/blender/intern/smoke/intern/FLUID_3D.h
    branches/bmesh/blender/intern/smoke/intern/WTURBULENCE.cpp
    branches/bmesh/blender/intern/smoke/intern/smoke_API.cpp
    branches/bmesh/blender/intern/string/intern/STR_String.cpp
    branches/bmesh/blender/po/Makefile
    branches/bmesh/blender/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/bmesh/blender/release/Makefile
    branches/bmesh/blender/release/VERSION
    branches/bmesh/blender/release/datafiles/splash.png
    branches/bmesh/blender/release/plugins/Makefile
    branches/bmesh/blender/release/plugins/bmake
    branches/bmesh/blender/release/plugins/sequence/Makefile
    branches/bmesh/blender/release/plugins/texture/Makefile
    branches/bmesh/blender/release/scripts/io/export_3ds.py
    branches/bmesh/blender/release/scripts/io/export_fbx.py
    branches/bmesh/blender/release/scripts/io/export_mdd.py
    branches/bmesh/blender/release/scripts/io/export_obj.py
    branches/bmesh/blender/release/scripts/io/export_ply.py
    branches/bmesh/blender/release/scripts/io/export_x3d.py
    branches/bmesh/blender/release/scripts/io/import_anim_bvh.py
    branches/bmesh/blender/release/scripts/io/import_scene_3ds.py
    branches/bmesh/blender/release/scripts/io/import_scene_obj.py
    branches/bmesh/blender/release/scripts/io/import_shape_mdd.py
    branches/bmesh/blender/release/scripts/io/netrender/__init__.py
    branches/bmesh/blender/release/scripts/io/netrender/client.py
    branches/bmesh/blender/release/scripts/io/netrender/master.py
    branches/bmesh/blender/release/scripts/io/netrender/master_html.py
    branches/bmesh/blender/release/scripts/io/netrender/operators.py
    branches/bmesh/blender/release/scripts/io/netrender/repath.py
    branches/bmesh/blender/release/scripts/io/netrender/slave.py
    branches/bmesh/blender/release/scripts/io/netrender/ui.py
    branches/bmesh/blender/release/scripts/io/netrender/utils.py
    branches/bmesh/blender/release/scripts/keyingsets/keyingsets_utils.py
    branches/bmesh/blender/release/scripts/modules/add_object_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
    branches/bmesh/blender/release/scripts/modules/bpy/utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_types.py
    branches/bmesh/blender/release/scripts/modules/graphviz_export.py
    branches/bmesh/blender/release/scripts/modules/rigify/__init__.py
    branches/bmesh/blender/release/scripts/modules/rigify/arm_biped.py
    branches/bmesh/blender/release/scripts/modules/rigify/copy.py
    branches/bmesh/blender/release/scripts/modules/rigify/delta.py
    branches/bmesh/blender/release/scripts/modules/rigify/eye_balls.py
    branches/bmesh/blender/release/scripts/modules/rigify/eye_lid.py
    branches/bmesh/blender/release/scripts/modules/rigify/finger_curl.py
    branches/bmesh/blender/release/scripts/modules/rigify/leg_biped.py
    branches/bmesh/blender/release/scripts/modules/rigify/leg_quadruped.py
    branches/bmesh/blender/release/scripts/modules/rigify/mouth.py
    branches/bmesh/blender/release/scripts/modules/rigify/neck.py
    branches/bmesh/blender/release/scripts/modules/rigify/neck_flex.py
    branches/bmesh/blender/release/scripts/modules/rigify/palm_curl.py
    branches/bmesh/blender/release/scripts/modules/rigify/shape_key_control.py
    branches/bmesh/blender/release/scripts/modules/rigify/shape_key_distance.py
    branches/bmesh/blender/release/scripts/modules/rigify/shape_key_rotdiff.py
    branches/bmesh/blender/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/bmesh/blender/release/scripts/modules/rigify/stretch.py
    branches/bmesh/blender/release/scripts/modules/rigify/stretch_twist.py
    branches/bmesh/blender/release/scripts/modules/rigify/tail_control.py
    branches/bmesh/blender/release/scripts/modules/rigify/tongue.py
    branches/bmesh/blender/release/scripts/modules/rigify/track_dual.py
    branches/bmesh/blender/release/scripts/modules/rigify/track_reverse.py
    branches/bmesh/blender/release/scripts/modules/rigify_utils.py
    branches/bmesh/blender/release/scripts/modules/rna_info.py
    branches/bmesh/blender/release/scripts/modules/rna_prop_ui.py
    branches/bmesh/blender/release/scripts/op/add_armature_human.py
    branches/bmesh/blender/release/scripts/op/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/op/fcurve_euler_filter.py
    branches/bmesh/blender/release/scripts/op/image.py
    branches/bmesh/blender/release/scripts/op/mesh.py
    branches/bmesh/blender/release/scripts/op/nla.py
    branches/bmesh/blender/release/scripts/op/object.py
    branches/bmesh/blender/release/scripts/op/object_align.py
    branches/bmesh/blender/release/scripts/op/object_randomize_transform.py
    branches/bmesh/blender/release/scripts/op/presets.py
    branches/bmesh/blender/release/scripts/op/screen_play_rendered_anim.py
    branches/bmesh/blender/release/scripts/op/sequencer.py
    branches/bmesh/blender/release/scripts/op/uv.py
    branches/bmesh/blender/release/scripts/op/uvcalc_follow_active.py
    branches/bmesh/blender/release/scripts/op/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/op/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/op/wm.py
    branches/bmesh/blender/release/scripts/presets/interaction/blender.py
    branches/bmesh/blender/release/scripts/presets/interaction/maya.py
    branches/bmesh/blender/release/scripts/templates/gamelogic.py
    branches/bmesh/blender/release/scripts/templates/operator.py
    branches/bmesh/blender/release/scripts/templates/operator_modal.py
    branches/bmesh/blender/release/scripts/templates/operator_modal_draw.py
    branches/bmesh/blender/release/scripts/templates/operator_modal_view3d.py
    branches/bmesh/blender/release/scripts/templates/operator_simple.py
    branches/bmesh/blender/release/scripts/templates/operator_uv.py
    branches/bmesh/blender/release/scripts/templates/panel_simple.py
    branches/bmesh/blender/release/scripts/ui/properties_animviz.py
    branches/bmesh/blender/release/scripts/ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/ui/properties_data_armature_rigify.py
    branches/bmesh/blender/release/scripts/ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/ui/properties_data_curve.py
    branches/bmesh/blender/release/scripts/ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/ui/properties_game.py
    branches/bmesh/blender/release/scripts/ui/properties_material.py
    branches/bmesh/blender/release/scripts/ui/properties_object.py
    branches/bmesh/blender/release/scripts/ui/properties_object_constraint.py
    branches/bmesh/blender/release/scripts/ui/properties_particle.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_cloth.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_common.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/ui/properties_physics_softbody.py
    branches/bmesh/blender/release/scripts/ui/properties_render.py
    branches/bmesh/blender/release/scripts/ui/properties_scene.py
    branches/bmesh/blender/release/scripts/ui/properties_texture.py
    branches/bmesh/blender/release/scripts/ui/properties_world.py
    branches/bmesh/blender/release/scripts/ui/space_console.py
    branches/bmesh/blender/release/scripts/ui/space_dopesheet.py
    branches/bmesh/blender/release/scripts/ui/space_filebrowser.py
    branches/bmesh/blender/release/scripts/ui/space_graph.py
    branches/bmesh/blender/release/scripts/ui/space_image.py
    branches/bmesh/blender/release/scripts/ui/space_info.py
    branches/bmesh/blender/release/scripts/ui/space_logic.py
    branches/bmesh/blender/release/scripts/ui/space_nla.py
    branches/bmesh/blender/release/scripts/ui/space_node.py
    branches/bmesh/blender/release/scripts/ui/space_outliner.py
    branches/bmesh/blender/release/scripts/ui/space_sequencer.py
    branches/bmesh/blender/release/scripts/ui/space_text.py
    branches/bmesh/blender/release/scripts/ui/space_time.py
    branches/bmesh/blender/release/scripts/ui/space_userpref.py
    branches/bmesh/blender/release/scripts/ui/space_userpref_keymap.py
    branches/bmesh/blender/release/scripts/ui/space_view3d.py
    branches/bmesh/blender/release/scripts/ui/space_view3d_toolbar.py
    branches/bmesh/blender/release/text/copyright.txt
    branches/bmesh/blender/release/text/readme.html
    branches/bmesh/blender/source/Makefile
    branches/bmesh/blender/source/blender/CMakeLists.txt
    branches/bmesh/blender/source/blender/Makefile
    branches/bmesh/blender/source/blender/SConscript
    branches/bmesh/blender/source/blender/avi/AVI_avi.h
    branches/bmesh/blender/source/blender/avi/CMakeLists.txt
    branches/bmesh/blender/source/blender/avi/Makefile
    branches/bmesh/blender/source/blender/avi/intern/Makefile
    branches/bmesh/blender/source/blender/avi/intern/avi.c
    branches/bmesh/blender/source/blender/avi/intern/avi_intern.h
    branches/bmesh/blender/source/blender/blenfont/Makefile
    branches/bmesh/blender/source/blender/blenfont/intern/Makefile
    branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
    branches/bmesh/blender/source/blender/blenkernel/BKE_anim.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_bmesh.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_brush.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_cloth.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_collision.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_colortools.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_curve.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_depsgraph.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_displist.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_effect.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_main.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_material.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_pointcache.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sca.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sound.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_text.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
    branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenkernel/Makefile
    branches/bmesh/blender/source/blender/blenkernel/SConscript
    branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
    branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/Makefile
    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
    branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
    branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
    branches/bmesh/blender/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
    branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
    branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
    branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/context.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
    branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
    branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
    branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
    branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c
    branches/bmesh/blender/source/blender/blenkernel/intern/fmodifier.c
    branches/bmesh/blender/source/blender/blenkernel/intern/font.c
    branches/bmesh/blender/source/blender/blenkernel/intern/group.c
    branches/bmesh/blender/source/blender/blenkernel/intern/icons.c
    branches/bmesh/blender/source/blender/blenkernel/intern/idprop.c
    branches/bmesh/blender/source/blender/blenkernel/intern/image.c
    branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
    branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
    branches/bmesh/blender/source/blender/blenkernel/intern/key.c
    branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
    branches/bmesh/blender/source/blender/blenkernel/intern/library.c
    branches/bmesh/blender/source/blender/blenkernel/intern/material.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
    branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
    branches/bmesh/blender/source/blender/blenkernel/intern/node.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/paint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
    branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
    branches/bmesh/blender/source/blender/blenkernel/intern/property.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sca.c
    branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
    branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
    branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
    branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
    branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
    branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenkernel/intern/world.c
    branches/bmesh/blender/source/blender/blenkernel/intern/writeframeserver.c
    branches/bmesh/blender/source/blender/blenlib/BLI_cellalloc.h
    branches/bmesh/blender/source/blender/blenlib/BLI_ghash.h
    branches/bmesh/blender/source/blender/blenlib/BLI_listbase.h
    branches/bmesh/blender/source/blender/blenlib/BLI_math_rotation.h
    branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
    branches/bmesh/blender/source/blender/blenlib/BLI_path_util.h
    branches/bmesh/blender/source/blender/blenlib/BLI_storage_types.h
    branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenlib/Makefile
    branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
    branches/bmesh/blender/source/blender/blenlib/intern/Makefile
    branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
    branches/bmesh/blender/source/blender/blenlib/intern/fileops.c
    branches/bmesh/blender/source/blender/blenlib/intern/listbase.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_color.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_geom_inline.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_rotation.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
    branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
    branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
    branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c
    branches/bmesh/blender/source/blender/blenlib/intern/storage.c
    branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
    branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
    branches/bmesh/blender/source/blender/blenloader/Makefile
    branches/bmesh/blender/source/blender/blenloader/intern/Makefile
    branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/undofile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/blenpluginapi/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenpluginapi/Makefile
    branches/bmesh/blender/source/blender/blenpluginapi/intern/Makefile
    branches/bmesh/blender/source/blender/collada/DocumentExporter.cpp
    branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
    branches/bmesh/blender/source/blender/collada/SConscript
    branches/bmesh/blender/source/blender/editors/Makefile
    branches/bmesh/blender/source/blender/editors/animation/Makefile
    branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c
    branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
    branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
    branches/bmesh/blender/source/blender/editors/animation/anim_ops.c
    branches/bmesh/blender/source/blender/editors/animation/drivers.c
    branches/bmesh/blender/source/blender/editors/animation/fmodifier_ui.c
    branches/bmesh/blender/source/blender/editors/animation/keyframes_draw.c
    branches/bmesh/blender/source/blender/editors/animation/keyframes_edit.c
    branches/bmesh/blender/source/blender/editors/animation/keyframes_general.c
    branches/bmesh/blender/source/blender/editors/animation/keyframing.c
    branches/bmesh/blender/source/blender/editors/animation/keyingsets.c
    branches/bmesh/blender/source/blender/editors/armature/Makefile
    branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_generate.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
    branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.c
    branches/bmesh/blender/source/blender/editors/armature/poseSlide.c
    branches/bmesh/blender/source/blender/editors/armature/poseUtils.c
    branches/bmesh/blender/source/blender/editors/armature/poselib.c
    branches/bmesh/blender/source/blender/editors/armature/poseobject.c
    branches/bmesh/blender/source/blender/editors/armature/reeb.c
    branches/bmesh/blender/source/blender/editors/curve/Makefile
    branches/bmesh/blender/source/blender/editors/curve/curve_ops.c
    branches/bmesh/blender/source/blender/editors/curve/editcurve.c
    branches/bmesh/blender/source/blender/editors/curve/editfont.c
    branches/bmesh/blender/source/blender/editors/datafiles/Makefile
    branches/bmesh/blender/source/blender/editors/datafiles/SConscript
    branches/bmesh/blender/source/blender/editors/datafiles/splash.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/startup.blend.c
    branches/bmesh/blender/source/blender/editors/gpencil/Makefile
    branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
    branches/bmesh/blender/source/blender/editors/gpencil/editaction_gpencil.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_buttons.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_edit.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
    branches/bmesh/blender/source/blender/editors/include/ED_armature.h
    branches/bmesh/blender/source/blender/editors/include/ED_curve.h
    branches/bmesh/blender/source/blender/editors/include/ED_datafiles.h
    branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
    branches/bmesh/blender/source/blender/editors/include/ED_object.h
    branches/bmesh/blender/source/blender/editors/include/ED_sculpt.h
    branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
    branches/bmesh/blender/source/blender/editors/include/UI_icons.h
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/interface/Makefile
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_anim.c
    branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
    branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
    branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_style.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
    branches/bmesh/blender/source/blender/editors/interface/resources.c
    branches/bmesh/blender/source/blender/editors/interface/view2d.c
    branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
    branches/bmesh/blender/source/blender/editors/mesh/Makefile
    branches/bmesh/blender/source/blender/editors/mesh/editface.c
    branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
    branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
    branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
    branches/bmesh/blender/source/blender/editors/metaball/Makefile
    branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c
    branches/bmesh/blender/source/blender/editors/metaball/mball_ops.c
    branches/bmesh/blender/source/blender/editors/object/Makefile
    branches/bmesh/blender/source/blender/editors/object/object_add.c
    branches/bmesh/blender/source/blender/editors/object/object_bake.c
    branches/bmesh/blender/source/blender/editors/object/object_constraint.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c
    branches/bmesh/blender/source/blender/editors/object/object_group.c
    branches/bmesh/blender/source/blender/editors/object/object_hook.c
    branches/bmesh/blender/source/blender/editors/object/object_intern.h
    branches/bmesh/blender/source/blender/editors/object/object_lattice.c
    branches/bmesh/blender/source/blender/editors/object/object_modifier.c
    branches/bmesh/blender/source/blender/editors/object/object_ops.c
    branches/bmesh/blender/source/blender/editors/object/object_relations.c
    branches/bmesh/blender/source/blender/editors/object/object_select.c
    branches/bmesh/blender/source/blender/editors/object/object_shapekey.c
    branches/bmesh/blender/source/blender/editors/object/object_transform.c
    branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
    branches/bmesh/blender/source/blender/editors/physics/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/physics/Makefile
    branches/bmesh/blender/source/blender/editors/physics/particle_boids.c
    branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
    branches/bmesh/blender/source/blender/editors/physics/particle_object.c
    branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
    branches/bmesh/blender/source/blender/editors/physics/physics_ops.c
    branches/bmesh/blender/source/blender/editors/physics/physics_pointcache.c
    branches/bmesh/blender/source/blender/editors/render/Makefile
    branches/bmesh/blender/source/blender/editors/render/render_internal.c
    branches/bmesh/blender/source/blender/editors/render/render_opengl.c
    branches/bmesh/blender/source/blender/editors/render/render_preview.c
    branches/bmesh/blender/source/blender/editors/render/render_shading.c
    branches/bmesh/blender/source/blender/editors/screen/Makefile
    branches/bmesh/blender/source/blender/editors/screen/area.c
    branches/bmesh/blender/source/blender/editors/screen/screen_context.c
    branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
    branches/bmesh/blender/source/blender/editors/screen/screen_intern.h
    branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
    branches/bmesh/blender/source/blender/editors/screen/screendump.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/Makefile
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_undo.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_utils.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/bmesh/blender/source/blender/editors/sound/Makefile
    branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
    branches/bmesh/blender/source/blender/editors/space_action/Makefile
    branches/bmesh/blender/source/blender/editors/space_action/action_draw.c
    branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
    branches/bmesh/blender/source/blender/editors/space_action/action_ops.c
    branches/bmesh/blender/source/blender/editors/space_action/action_select.c
    branches/bmesh/blender/source/blender/editors/space_action/space_action.c
    branches/bmesh/blender/source/blender/editors/space_api/Makefile
    branches/bmesh/blender/source/blender/editors/space_api/space.c
    branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
    branches/bmesh/blender/source/blender/editors/space_buttons/Makefile
    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_ops.c
    branches/bmesh/blender/source/blender/editors/space_buttons/space_buttons.c
    branches/bmesh/blender/source/blender/editors/space_console/Makefile
    branches/bmesh/blender/source/blender/editors/space_console/console_draw.c
    branches/bmesh/blender/source/blender/editors/space_console/console_ops.c
    branches/bmesh/blender/source/blender/editors/space_console/console_report.c
    branches/bmesh/blender/source/blender/editors/space_console/space_console.c
    branches/bmesh/blender/source/blender/editors/space_file/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/space_file/Makefile
    branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
    branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
    branches/bmesh/blender/source/blender/editors/space_file/filelist.c
    branches/bmesh/blender/source/blender/editors/space_file/filesel.c
    branches/bmesh/blender/source/blender/editors/space_file/fsmenu.c
    branches/bmesh/blender/source/blender/editors/space_file/space_file.c
    branches/bmesh/blender/source/blender/editors/space_file/writeimage.c
    branches/bmesh/blender/source/blender/editors/space_graph/Makefile
    branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_utils.c
    branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
    branches/bmesh/blender/source/blender/editors/space_image/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/space_image/Makefile
    branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
    branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
    branches/bmesh/blender/source/blender/editors/space_image/image_header.c
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_image/image_render.c
    branches/bmesh/blender/source/blender/editors/space_image/space_image.c
    branches/bmesh/blender/source/blender/editors/space_info/Makefile
    branches/bmesh/blender/source/blender/editors/space_info/info_ops.c
    branches/bmesh/blender/source/blender/editors/space_info/info_stats.c
    branches/bmesh/blender/source/blender/editors/space_info/space_info.c
    branches/bmesh/blender/source/blender/editors/space_logic/Makefile
    branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c
    branches/bmesh/blender/source/blender/editors/space_logic/logic_intern.h
    branches/bmesh/blender/source/blender/editors/space_logic/logic_ops.c
    branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
    branches/bmesh/blender/source/blender/editors/space_logic/space_logic.c
    branches/bmesh/blender/source/blender/editors/space_nla/Makefile
    branches/bmesh/blender/source/blender/editors/space_nla/nla_buttons.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_channels.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_draw.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_edit.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_ops.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_select.c
    branches/bmesh/blender/source/blender/editors/space_nla/space_nla.c
    branches/bmesh/blender/source/blender/editors/space_node/Makefile
    branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
    branches/bmesh/blender/source/blender/editors/space_node/node_buttons.c
    branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
    branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
    branches/bmesh/blender/source/blender/editors/space_node/node_header.c
    branches/bmesh/blender/source/blender/editors/space_node/node_ops.c
    branches/bmesh/blender/source/blender/editors/space_node/node_select.c
    branches/bmesh/blender/source/blender/editors/space_node/node_state.c
    branches/bmesh/blender/source/blender/editors/space_node/space_node.c
    branches/bmesh/blender/source/blender/editors/space_outliner/Makefile
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
    branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
    branches/bmesh/blender/source/blender/editors/space_script/Makefile
    branches/bmesh/blender/source/blender/editors/space_script/script_edit.c
    branches/bmesh/blender/source/blender/editors/space_script/script_header.c
    branches/bmesh/blender/source/blender/editors/space_script/script_ops.c
    branches/bmesh/blender/source/blender/editors/space_script/space_script.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/Makefile
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/space_sequencer.c
    branches/bmesh/blender/source/blender/editors/space_sound/Makefile
    branches/bmesh/blender/source/blender/editors/space_sound/sound_header.c
    branches/bmesh/blender/source/blender/editors/space_sound/space_sound.c
    branches/bmesh/blender/source/blender/editors/space_text/Makefile
    branches/bmesh/blender/source/blender/editors/space_text/space_text.c
    branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
    branches/bmesh/blender/source/blender/editors/space_text/text_header.c
    branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
    branches/bmesh/blender/source/blender/editors/space_time/Makefile
    branches/bmesh/blender/source/blender/editors/space_time/space_time.c
    branches/bmesh/blender/source/blender/editors/space_time/time_ops.c
    branches/bmesh/blender/source/blender/editors/space_userpref/Makefile
    branches/bmesh/blender/source/blender/editors/space_userpref/space_userpref.c
    branches/bmesh/blender/source/blender/editors/space_view3d/Makefile
    branches/bmesh/blender/source/blender/editors/space_view3d/drawanimviz.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawvolume.c
    branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
    branches/bmesh/blender/source/blender/editors/transform/Makefile
    branches/bmesh/blender/source/blender/editors/transform/transform.c
    branches/bmesh/blender/source/blender/editors/transform/transform_constraints.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
    branches/bmesh/blender/source/blender/editors/transform/transform_input.c
    branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
    branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
    branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
    branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
    branches/bmesh/blender/source/blender/editors/util/Makefile
    branches/bmesh/blender/source/blender/editors/util/ed_util.c
    branches/bmesh/blender/source/blender/editors/util/editmode_undo.c
    branches/bmesh/blender/source/blender/editors/util/numinput.c
    branches/bmesh/blender/source/blender/editors/util/undo.c
    branches/bmesh/blender/source/blender/editors/uvedit/Makefile
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/bmesh/blender/source/blender/gpu/GPU_material.h
    branches/bmesh/blender/source/blender/gpu/Makefile
    branches/bmesh/blender/source/blender/gpu/intern/Makefile
    branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/bmesh/blender/source/blender/ikplugin/Makefile
    branches/bmesh/blender/source/blender/ikplugin/intern/Makefile
    branches/bmesh/blender/source/blender/ikplugin/intern/ikplugin_api.c
    branches/bmesh/blender/source/blender/imbuf/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
    branches/bmesh/blender/source/blender/imbuf/Makefile
    branches/bmesh/blender/source/blender/imbuf/SConscript
    branches/bmesh/blender/source/blender/imbuf/intern/Makefile
    branches/bmesh/blender/source/blender/imbuf/intern/allocimbuf.c
    branches/bmesh/blender/source/blender/imbuf/intern/anim.c
    branches/bmesh/blender/source/blender/imbuf/intern/cache.c
    branches/bmesh/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/intern/cineon/Makefile
    branches/bmesh/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/intern/dds/Makefile
    branches/bmesh/blender/source/blender/imbuf/intern/filetype.c
    branches/bmesh/blender/source/blender/imbuf/intern/filter.c
    branches/bmesh/blender/source/blender/imbuf/intern/imageprocess.c
    branches/bmesh/blender/source/blender/imbuf/intern/imbuf.h
    branches/bmesh/blender/source/blender/imbuf/intern/iris.c
    branches/bmesh/blender/source/blender/imbuf/intern/jp2.c
    branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
    branches/bmesh/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/intern/openexr/Makefile
    branches/bmesh/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/bmesh/blender/source/blender/imbuf/intern/png.c
    branches/bmesh/blender/source/blender/imbuf/intern/radiance_hdr.c
    branches/bmesh/blender/source/blender/imbuf/intern/rotate.c
    branches/bmesh/blender/source/blender/imbuf/intern/scaling.c
    branches/bmesh/blender/source/blender/imbuf/intern/targa.c
    branches/bmesh/blender/source/blender/imbuf/intern/thumbs.c
    branches/bmesh/blender/source/blender/imbuf/intern/thumbs_blend.c
    branches/bmesh/blender/source/blender/imbuf/intern/tiff.c
    branches/bmesh/blender/source/blender/imbuf/intern/util.c
    branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
    branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_actuator_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_color_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_image_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_lattice_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sdna_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_smoke_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sound_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
    branches/bmesh/blender/source/blender/makesdna/Makefile
    branches/bmesh/blender/source/blender/makesdna/intern/Makefile
    branches/bmesh/blender/source/blender/makesdna/intern/SConscript
    branches/bmesh/blender/source/blender/makesdna/intern/dna_genfile.c
    branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
    branches/bmesh/blender/source/blender/makesrna/Makefile
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
    branches/bmesh/blender/source/blender/makesrna/RNA_define.h
    branches/bmesh/blender/source/blender/makesrna/RNA_enum_types.h
    branches/bmesh/blender/source/blender/makesrna/RNA_types.h
    branches/bmesh/blender/source/blender/makesrna/SConscript
    branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/bmesh/blender/source/blender/makesrna/intern/Makefile
    branches/bmesh/blender/source/blender/makesrna/intern/SConscript
    branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_animation.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_animviz.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_boid.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_brush.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_camera.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_cloth.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_color.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_context.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_controller.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_gpencil.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_group.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_image_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_internal_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_key.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_lamp.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_lattice.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_main.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_material_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_meta.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nla.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_property.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_screen.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sensor.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sound.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_text.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_timeline.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_vfont.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_wm_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
    branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt
    branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
    branches/bmesh/blender/source/blender/modifiers/MOD_modifiertypes.h
    branches/bmesh/blender/source/blender/modifiers/Makefile
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_armature.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_cast.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_cloth.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_collision.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_curve.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_hook.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_lattice.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_multires.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_none.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_screw.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_smoke.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.h
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_wave.c
    branches/bmesh/blender/source/blender/modifiers/intern/Makefile
    branches/bmesh/blender/source/blender/nodes/Makefile
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_value.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/bmesh/blender/source/blender/nodes/intern/CMP_util.c
    branches/bmesh/blender/source/blender/nodes/intern/Makefile
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    branches/bmesh/blender/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/bmesh/blender/source/blender/python/CMakeLists.txt
    branches/bmesh/blender/source/blender/python/Makefile
    branches/bmesh/blender/source/blender/python/SConscript
    branches/bmesh/blender/source/blender/python/doc/epy/Geometry.py
    branches/bmesh/blender/source/blender/python/doc/examples/mathutils.py
    branches/bmesh/blender/source/blender/python/doc/sphinx_doc_gen.py
    branches/bmesh/blender/source/blender/python/generic/Makefile
    branches/bmesh/blender/source/blender/python/generic/bgl.c
    branches/bmesh/blender/source/blender/python/generic/blf_api.c
    branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
    branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.h
    branches/bmesh/blender/source/blender/python/generic/geometry.c
    branches/bmesh/blender/source/blender/python/generic/mathutils.c
    branches/bmesh/blender/source/blender/python/generic/mathutils.h
    branches/bmesh/blender/source/blender/python/generic/mathutils_color.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_euler.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_matrix.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_quat.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_vector.c
    branches/bmesh/blender/source/blender/python/intern/Makefile
    branches/bmesh/blender/source/blender/python/intern/bpy.c
    branches/bmesh/blender/source/blender/python/intern/bpy_app.c
    branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
    branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
    branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
    branches/bmesh/blender/source/blender/python/intern/bpy_rna_callback.c
    branches/bmesh/blender/source/blender/python/intern/bpy_util.c
    branches/bmesh/blender/source/blender/python/intern/bpy_util.h
    branches/bmesh/blender/source/blender/quicktime/CMakeLists.txt
    branches/bmesh/blender/source/blender/quicktime/Makefile
    branches/bmesh/blender/source/blender/quicktime/apple/Makefile
    branches/bmesh/blender/source/blender/readblenfile/CMakeLists.txt
    branches/bmesh/blender/source/blender/readblenfile/Makefile
    branches/bmesh/blender/source/blender/readblenfile/intern/Makefile
    branches/bmesh/blender/source/blender/readblenfile/stub/Makefile
    branches/bmesh/blender/source/blender/readblenfile/test/Makefile
    branches/bmesh/blender/source/blender/render/CMakeLists.txt
    branches/bmesh/blender/source/blender/render/Makefile
    branches/bmesh/blender/source/blender/render/SConscript
    branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
    branches/bmesh/blender/source/blender/render/intern/Makefile
    branches/bmesh/blender/source/blender/render/intern/include/render_types.h
    branches/bmesh/blender/source/blender/render/intern/include/renderdatabase.h
    branches/bmesh/blender/source/blender/render/intern/include/texture.h
    branches/bmesh/blender/source/blender/render/intern/include/volume_precache.h
    branches/bmesh/blender/source/blender/render/intern/raytrace/Makefile
    branches/bmesh/blender/source/blender/render/intern/raytrace/bvh.h
    branches/bmesh/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/bmesh/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/bmesh/blender/source/blender/render/intern/raytrace/reorganize.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/render/intern/source/envmap.c
    branches/bmesh/blender/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
    branches/bmesh/blender/source/blender/render/intern/source/pointdensity.c
    branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
    branches/bmesh/blender/source/blender/render/intern/source/renderdatabase.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
    branches/bmesh/blender/source/blender/render/intern/source/sss.c
    branches/bmesh/blender/source/blender/render/intern/source/texture.c
    branches/bmesh/blender/source/blender/render/intern/source/volume_precache.c
    branches/bmesh/blender/source/blender/render/intern/source/volumetric.c
    branches/bmesh/blender/source/blender/render/intern/source/voxeldata.c
    branches/bmesh/blender/source/blender/verify/Makefile
    branches/bmesh/blender/source/blender/verify/intern/Makefile
    branches/bmesh/blender/source/blender/windowmanager/Makefile
    branches/bmesh/blender/source/blender/windowmanager/WM_api.h
    branches/bmesh/blender/source/blender/windowmanager/intern/Makefile
    branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_jobs.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
    branches/bmesh/blender/source/blender/windowmanager/wm_window.h
    branches/bmesh/blender/source/blenderplayer/CMakeLists.txt
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/Makefile
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/bmesh/blender/source/creator/CMakeLists.txt
    branches/bmesh/blender/source/creator/Makefile
    branches/bmesh/blender/source/creator/SConscript
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/darwin/Makefile
    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/bmesh/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/BlenderRoutines/Makefile
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/bmesh/blender/source/gameengine/Converter/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/bmesh/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/bmesh/blender/source/gameengine/Converter/Makefile
    branches/bmesh/blender/source/gameengine/Expressions/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Expressions/Makefile
    branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.h
    branches/bmesh/blender/source/gameengine/GameLogic/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/GameLogic/Joystick/Makefile
    branches/bmesh/blender/source/gameengine/GameLogic/Makefile
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_ISensor.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/GamePlayer/common/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/common/unix/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/common/windows/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/common/npmac.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/src/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/src/xpcom/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/test/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/test/colorcycle/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/test/gears/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/test/stub/Makefile
    branches/bmesh/blender/source/gameengine/GamePlayer/netscape/test/threaded_gears/Makefile
    branches/bmesh/blender/source/gameengine/Ketsji/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/Makefile
    branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Dome.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Light.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/bmesh/blender/source/gameengine/Ketsji/Makefile
    branches/bmesh/blender/source/gameengine/Makefile
    branches/bmesh/blender/source/gameengine/Network/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Network/LoopBackNetwork/Makefile
    branches/bmesh/blender/source/gameengine/Network/Makefile
    branches/bmesh/blender/source/gameengine/Network/NG_NetworkScene.cpp
    branches/bmesh/blender/source/gameengine/Network/TerraplayNetwork/Makefile
    branches/bmesh/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/bmesh/blender/source/gameengine/Physics/Bullet/Makefile
    branches/bmesh/blender/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Physics/Dummy/Makefile
    branches/bmesh/blender/source/gameengine/Physics/Makefile
    branches/bmesh/blender/source/gameengine/Physics/common/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Physics/common/Makefile
    branches/bmesh/blender/source/gameengine/PyDoc/bge.logic.rst
    branches/bmesh/blender/source/gameengine/PyDoc/bge.render.rst
    branches/bmesh/blender/source/gameengine/PyDoc/bge.types.rst
    branches/bmesh/blender/source/gameengine/Rasterizer/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Rasterizer/Makefile
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/bmesh/blender/source/gameengine/SceneGraph/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/SceneGraph/Makefile
    branches/bmesh/blender/source/gameengine/VideoTexture/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/VideoTexture/Makefile
    branches/bmesh/blender/source/icons/Makefile
    branches/bmesh/blender/source/kernel/CMakeLists.txt
    branches/bmesh/blender/source/kernel/Makefile
    branches/bmesh/blender/source/kernel/gen_messaging/Makefile
    branches/bmesh/blender/source/kernel/gen_messaging/intern/Makefile
    branches/bmesh/blender/source/kernel/gen_system/Makefile
    branches/bmesh/blender/source/tools/guess/guessconfig

Added Paths:
-----------
    branches/bmesh/blender/build_files/cmake/example_scripts/
    branches/bmesh/blender/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/bmesh/blender/build_files/make/dlltool/
    branches/bmesh/blender/build_files/make/dlltool/Makefile
    branches/bmesh/blender/build_files/make/dlltool/gettext.def
    branches/bmesh/blender/build_files/make/dlltool/iconv.def
    branches/bmesh/blender/build_files/make/dlltool/python.def
    branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
    branches/bmesh/blender/release/bin/
    branches/bmesh/blender/release/bin/.blender/
    branches/bmesh/blender/release/bin/.blender/locale/
    branches/bmesh/blender/release/bin/.blender/locale/ar/
    branches/bmesh/blender/release/bin/.blender/locale/ar/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/bg/
    branches/bmesh/blender/release/bin/.blender/locale/bg/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ca/
    branches/bmesh/blender/release/bin/.blender/locale/ca/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/cs/
    branches/bmesh/blender/release/bin/.blender/locale/cs/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/de/
    branches/bmesh/blender/release/bin/.blender/locale/de/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/el/
    branches/bmesh/blender/release/bin/.blender/locale/el/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/es/
    branches/bmesh/blender/release/bin/.blender/locale/es/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/fi/
    branches/bmesh/blender/release/bin/.blender/locale/fi/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/fr/
    branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/hr/
    branches/bmesh/blender/release/bin/.blender/locale/hr/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/hr_HR/
    branches/bmesh/blender/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/it/
    branches/bmesh/blender/release/bin/.blender/locale/it/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ja/
    branches/bmesh/blender/release/bin/.blender/locale/ja/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ko/
    branches/bmesh/blender/release/bin/.blender/locale/ko/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/nl/
    branches/bmesh/blender/release/bin/.blender/locale/nl/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/pl/
    branches/bmesh/blender/release/bin/.blender/locale/pl/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/pt_BR/
    branches/bmesh/blender/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ro/
    branches/bmesh/blender/release/bin/.blender/locale/ro/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ru/
    branches/bmesh/blender/release/bin/.blender/locale/ru/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/sr/
    branches/bmesh/blender/release/bin/.blender/locale/sr/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/sr at Latn/
    branches/bmesh/blender/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/sv/
    branches/bmesh/blender/release/bin/.blender/locale/sv/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/uk/
    branches/bmesh/blender/release/bin/.blender/locale/uk/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/zh_CN/
    branches/bmesh/blender/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/brushicons/
    branches/bmesh/blender/source/blender/editors/datafiles/add.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/blob.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/blur.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/clay.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/clone.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/crease.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/darken.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/draw.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/fill.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/flatten.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/grab.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/inflate.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/layer.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/lighten.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/mix.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/multiply.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/nudge.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/pinch.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/scrape.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/smear.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/smooth.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/snake_hook.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/soften.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/subtract.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/texdraw.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/thumb.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/twist.png.c
    branches/bmesh/blender/source/blender/editors/datafiles/vertexdraw.png.c
    branches/bmesh/blender/source/blender/editors/include/ED_lattice.h
    branches/bmesh/blender/source/blender/python/doc/alternative/
    branches/bmesh/blender/source/blender/python/doc/alternative/blender-org/
    branches/bmesh/blender/source/blender/python/doc/alternative/blender-org/static/
    branches/bmesh/blender/source/blender/python/doc/alternative/epy/
    branches/bmesh/blender/source/blender/python/doc/alternative/examples/
    branches/bmesh/blender/source/blender/python/doc/alternative/mako/
    branches/bmesh/blender/source/blender/python/doc/alternative/mako/ext/
    branches/bmesh/blender/source/blender/python/doc/alternative/markupsafe/
    branches/bmesh/blender/source/blender/python/doc/alternative/rst/
    branches/bmesh/blender/source/blender/python/doc/alternative/templates/

Removed Paths:
-------------
    branches/bmesh/blender/bin/
    branches/bmesh/blender/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/bmesh/blender/build_files/make/dlltool/Makefile
    branches/bmesh/blender/build_files/make/dlltool/gettext.def
    branches/bmesh/blender/build_files/make/dlltool/iconv.def
    branches/bmesh/blender/build_files/make/dlltool/python.def
    branches/bmesh/blender/dlltool/
    branches/bmesh/blender/release/bin/.blender/
    branches/bmesh/blender/release/bin/.blender/locale/
    branches/bmesh/blender/release/bin/.blender/locale/ar/
    branches/bmesh/blender/release/bin/.blender/locale/ar/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/bg/
    branches/bmesh/blender/release/bin/.blender/locale/bg/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ca/
    branches/bmesh/blender/release/bin/.blender/locale/ca/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/cs/
    branches/bmesh/blender/release/bin/.blender/locale/cs/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/de/
    branches/bmesh/blender/release/bin/.blender/locale/de/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/el/
    branches/bmesh/blender/release/bin/.blender/locale/el/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/es/
    branches/bmesh/blender/release/bin/.blender/locale/es/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/fi/
    branches/bmesh/blender/release/bin/.blender/locale/fi/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/fr/
    branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/hr/
    branches/bmesh/blender/release/bin/.blender/locale/hr/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/hr_HR/
    branches/bmesh/blender/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/it/
    branches/bmesh/blender/release/bin/.blender/locale/it/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ja/
    branches/bmesh/blender/release/bin/.blender/locale/ja/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ko/
    branches/bmesh/blender/release/bin/.blender/locale/ko/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/nl/
    branches/bmesh/blender/release/bin/.blender/locale/nl/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/pl/
    branches/bmesh/blender/release/bin/.blender/locale/pl/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/pt_BR/
    branches/bmesh/blender/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ro/
    branches/bmesh/blender/release/bin/.blender/locale/ro/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/ru/
    branches/bmesh/blender/release/bin/.blender/locale/ru/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/sr/
    branches/bmesh/blender/release/bin/.blender/locale/sr/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/sr at Latn/
    branches/bmesh/blender/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/sv/
    branches/bmesh/blender/release/bin/.blender/locale/sv/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/uk/
    branches/bmesh/blender/release/bin/.blender/locale/uk/LC_MESSAGES/
    branches/bmesh/blender/release/bin/.blender/locale/zh_CN/
    branches/bmesh/blender/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
    branches/bmesh/blender/release/scripts/io/engine_render_pov.py
    branches/bmesh/blender/release/scripts/ui/space_buttons.py
    branches/bmesh/blender/source/blender/editors/space_logic/logic_header.c
    branches/bmesh/blender/source/blender/makesdna/DNA_wave_types.h
    branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/bmesh/blender/source/blender/python/doc/alternative/blender-org/
    branches/bmesh/blender/source/blender/python/doc/alternative/blender-org/static/
    branches/bmesh/blender/source/blender/python/doc/alternative/epy/
    branches/bmesh/blender/source/blender/python/doc/alternative/examples/
    branches/bmesh/blender/source/blender/python/doc/alternative/mako/
    branches/bmesh/blender/source/blender/python/doc/alternative/mako/ext/
    branches/bmesh/blender/source/blender/python/doc/alternative/markupsafe/
    branches/bmesh/blender/source/blender/python/doc/alternative/rst/
    branches/bmesh/blender/source/blender/python/doc/alternative/templates/
    branches/bmesh/blender/source/gameengine/PyDoc/SConscript

Property Changed:
----------------
    branches/bmesh/blender/release/scripts/io/netrender/repath.py

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2010-09-03 19:56:22 UTC (rev 31745)
+++ branches/bmesh/blender/CMakeLists.txt	2010-09-04 05:31:25 UTC (rev 31746)
@@ -69,7 +69,7 @@
 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_FLUID        "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)
@@ -82,10 +82,12 @@
 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)
+OPTION(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
+OPTION(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
+OPTION(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
+OPTION(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
 
 # Audio format support
 OPTION(WITH_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
@@ -115,6 +117,7 @@
 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)
+OPTION(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
 IF(APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -130,6 +133,10 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+	MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
+ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+
 TEST_SSE_SUPPORT()
 
 # disabled for now, not supported
@@ -215,7 +222,7 @@
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	IF(WITH_OPENEXR)
+	IF(WITH_IMAGE_OPENEXR)
 		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
 		FIND_PATH(OPENEXR_INC
 			ImfXdr.h
@@ -230,16 +237,16 @@
 		SET(OPENEXR_LIB Half IlmImf Iex Imath)
 		
 		IF(NOT OPENEXR_INC)
-			SET(WITH_OPENEXR OFF)
+			SET(WITH_IMAGE_OPENEXR OFF)
 		ENDIF(NOT OPENEXR_INC)
-	ENDIF(WITH_OPENEXR)
+	ENDIF(WITH_IMAGE_OPENEXR)
 
-	IF(WITH_TIFF)
+	IF(WITH_IMAGE_TIFF)
 		FIND_PACKAGE(TIFF)
 		IF(NOT TIFF_FOUND)
-			SET(WITH_TIFF OFF)
+			SET(WITH_IMAGE_TIFF OFF)
 		ENDIF(NOT TIFF_FOUND)
-	ENDIF(WITH_TIFF)
+	ENDIF(WITH_IMAGE_TIFF)
 
 	FIND_PACKAGE(JPEG REQUIRED)
 
@@ -309,12 +316,6 @@
 
 	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
@@ -492,7 +493,7 @@
 			SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		ENDIF(WITH_FFMPEG)
 
-		IF(WITH_OPENEXR)
+		IF(WITH_IMAGE_OPENEXR)
 			SET(OPENEXR ${LIBDIR}/openexr)
 			SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
 			SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
@@ -504,14 +505,14 @@
 			IF (MSVC90)
 				SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
 			ENDIF(MSVC90)
-		ENDIF(WITH_OPENEXR)
+		ENDIF(WITH_IMAGE_OPENEXR)
 
-		IF(WITH_TIFF)
+		IF(WITH_IMAGE_TIFF)
 			SET(TIFF ${LIBDIR}/tiff)
 			SET(TIFF_LIBRARY libtiff)
 			SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 			SET(TIFF_LIBPATH ${TIFF}/lib)
-		ENDIF(WITH_TIFF)
+		ENDIF(WITH_IMAGE_TIFF)
 
 		IF(WITH_JACK)
 			SET(JACK ${LIBDIR}/jack)
@@ -602,19 +603,19 @@
 			SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		ENDIF(WITH_FFMPEG)
 
-		IF(WITH_OPENEXR)
+		IF(WITH_IMAGE_OPENEXR)
 			SET(OPENEXR ${LIBDIR}/gcc/openexr)
 			SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
 			SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
 			SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
-		ENDIF(WITH_OPENEXR)
+		ENDIF(WITH_IMAGE_OPENEXR)
 
-		IF(WITH_TIFF)
+		IF(WITH_IMAGE_TIFF)
 			SET(TIFF ${LIBDIR}/gcc/tiff)
 			SET(TIFF_LIBRARY tiff)
 			SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 			SET(TIFF_LIBPATH ${TIFF}/lib)
-		ENDIF(WITH_TIFF)
+		ENDIF(WITH_IMAGE_TIFF)
 
 		IF(WITH_JACK)
 			SET(JACK ${LIBDIR}/jack)
@@ -626,12 +627,6 @@
 			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)
@@ -722,12 +717,12 @@
 	SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
 	SET(FREETYPE_LIBRARY freetype)
 
-	IF(WITH_OPENEXR)
+	IF(WITH_IMAGE_OPENEXR)
 		SET(OPENEXR ${LIBDIR}/openexr)
 		SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
 		SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
 		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
-	ENDIF(WITH_OPENEXR)
+	ENDIF(WITH_IMAGE_OPENEXR)
 
 	IF(WITH_LCMS)
 		SET(LCMS ${LIBDIR}/lcms)
@@ -805,19 +800,13 @@
 	SET(JPEG_INC "${JPEG}/include")
 	SET(JPEG_LIBPATH ${JPEG}/lib)
 
-	IF(WITH_TIFF)
+	IF(WITH_IMAGE_TIFF)
 		SET(TIFF ${LIBDIR}/tiff)
 		SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 		SET(TIFF_LIBRARY tiff)
 		SET(TIFF_LIBPATH ${TIFF}/lib)
-	ENDIF(WITH_TIFF)
+	ENDIF(WITH_IMAGE_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")
@@ -861,14 +850,31 @@
 		ENDIF(BUILD_REV_RETURN)
 	ENDIF(WIN32)
 ENDIF(WITH_BUILDINFO)
-	
 #-----------------------------------------------------------------------------
 # Common.
-IF(WITH_OPENJPEG)
+
+IF(WITH_RAYOPTIMIZATION)
+	IF(CMAKE_COMPILER_IS_GNUCC)
+		IF(SUPPORT_SSE_BUILD)
+			SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE__)
+			ADD_DEFINITIONS(-D__MMX__)
+		ENDIF(SUPPORT_SSE_BUILD)
+		IF(SUPPORT_SSE2_BUILD)
+			SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE2__)
+			IF(NOT SUPPORT_SSE_BUILD) # dont double up
+				ADD_DEFINITIONS(-D__MMX__)
+			ENDIF(NOT SUPPORT_SSE_BUILD)
+		ENDIF(SUPPORT_SSE2_BUILD)
+	ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ENDIF(WITH_RAYOPTIMIZATION)
+
+IF(WITH_IMAGE_OPENJPEG)
 	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 	set(OPENJPEG_INC ${OPENJPEG})
 	set(OPENJPEG_LIb extern_libopenjpeg)
-ENDIF(WITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
 
 #-----------------------------------------------------------------------------
 # Blender WebPlugin

Modified: branches/bmesh/blender/Makefile
===================================================================
--- branches/bmesh/blender/Makefile	2010-09-03 19:56:22 UTC (rev 31745)
+++ branches/bmesh/blender/Makefile	2010-09-04 05:31:25 UTC (rev 31746)
@@ -45,7 +45,7 @@
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= dlltool extern intern source po
+    DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
 else
     DIRS ?= extern intern source po
 endif

Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct	2010-09-03 19:56:22 UTC (rev 31745)
+++ branches/bmesh/blender/SConstruct	2010-09-04 05:31:25 UTC (rev 31746)
@@ -46,8 +46,11 @@
 import re
 from tempfile import mkdtemp
 
+# store path to tools
+toolpath=os.path.join(".", "build_files", "scons", "tools")
+
 # needed for importing tools
-sys.path.append(os.path.join(".", "build_files", "scons", "tools"))
+sys.path.append(toolpath)
 
 import Blender
 import btools
@@ -121,7 +124,7 @@
 	print "Using " + toolset
 	if toolset=='mstoolkit':
 		env = BlenderEnvironment(ENV = os.environ)
-		env.Tool('mstoolkit', ['tools'])
+		env.Tool('mstoolkit', [toolpath])
 	else:
 		env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
 		# xxx commented out, as was supressing warnings under mingw..
@@ -170,7 +173,7 @@
 
 if crossbuild and env['PLATFORM'] != 'win32':
 	print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
-	env.Tool('crossmingw', ['tools'])
+	env.Tool('crossmingw', [toolpath])
 	# todo: determine proper libs/includes etc.
 	# Needed for gui programs, console programs should do without it
 
@@ -207,14 +210,36 @@
 print B.bc.OKGREEN + "Build with parallel jobs%s: %s" % (B.bc.ENDC, GetOption('num_jobs'))
 print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
 
-# BLENDERPATH is a unix only option to enable typical style paths this is
-# spesifically a data-dir, which is used a lot but cant replace BF_INSTALLDIR
-# because the blender binary is installed in $BF_INSTALLDIR/bin/blender
+if 'blenderlite' in B.targets:
+	target_env_defs = {}
+	target_env_defs['WITH_BF_GAMEENGINE'] = False
+	target_env_defs['WITH_BF_OPENAL'] = False
+	target_env_defs['WITH_BF_OPENEXR'] = False
+	target_env_defs['WITH_BF_OPENMP'] = False
+	target_env_defs['WITH_BF_ICONV'] = False
+	target_env_defs['WITH_BF_INTERNATIONAL'] = False
+	target_env_defs['WITH_BF_OPENJPEG'] = False
+	target_env_defs['WITH_BF_FFMPEG'] = False
+	target_env_defs['WITH_BF_QUICKTIME'] = False
+	target_env_defs['WITH_BF_REDCODE'] = False
+	target_env_defs['WITH_BF_DDS'] = False
+	target_env_defs['WITH_BF_CINEON'] = False
+	target_env_defs['WITH_BF_HDR'] = False
+	target_env_defs['WITH_BF_ZLIB'] = False
+	target_env_defs['WITH_BF_SDL'] = False
+	target_env_defs['WITH_BF_JPEG'] = False
+	target_env_defs['WITH_BF_PNG'] = False
+	target_env_defs['WITH_BF_BULLET'] = False
+	target_env_defs['WITH_BF_BINRELOC'] = False
+	target_env_defs['BF_BUILDINFO'] = False
+	target_env_defs['BF_NO_ELBEEM'] = True

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list