[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25757] branches/bmesh/blender: Merge with trunk/2.5 at r25563
Joseph Eagar
joeedh at gmail.com
Tue Jan 5 23:33:46 CET 2010
Revision: 25757
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25757
Author: joeedh
Date: 2010-01-05 23:33:41 +0100 (Tue, 05 Jan 2010)
Log Message:
-----------
Merge with trunk/2.5 at r25563
Most likely will not compile for others, I'd appreciate any build errors
and missing files reports (I can never seem to get everything committed
and all the build systems working without help).
Porting over the sculpt/multires tools was a breeze,
thanks goes to brecht for a design that didn't exclude
ngons and was easy to port.
Note that I've not tested externally-backed multires
file support yet. Also, I still need to write version
patch code for some cases.
Some notes:
* Like trunk, topological changes don't update multires right,
so e.g. subdivide will duplicate multires data on the new faces,
instead of subdividing it.
* If you set the debug value (ctrl-alt-d) to 1 it'll turn on
my experiments in speeding up sculpting on higher-res multires
meshes (but note it makes partial redraw not completely accurate).
* There's a bug where you have to go through editmode to get out
of sculpt mode, not sure if I inherited or created this myself.
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/config/darwin-config.py
branches/bmesh/blender/config/linux2-config.py
branches/bmesh/blender/config/win32-mingw-config.py
branches/bmesh/blender/config/win32-vc-config.py
branches/bmesh/blender/config/win64-vc-config.py
branches/bmesh/blender/extern/Eigen2/Eigen/src/Core/util/Macros.h
branches/bmesh/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/bmesh/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/bmesh/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/bmesh/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/bmesh/blender/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/bmesh/blender/extern/bullet2/src/SConscript
branches/bmesh/blender/intern/audaspace/SRC/Makefile
branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.h
branches/bmesh/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/bmesh/blender/intern/audaspace/intern/AUD_ConverterFunctions.h
branches/bmesh/blender/intern/boolop/intern/BOP_Face2Face.cpp
branches/bmesh/blender/intern/ghost/CMakeLists.txt
branches/bmesh/blender/intern/ghost/SConscript
branches/bmesh/blender/intern/ghost/intern/GHOST_Debug.h
branches/bmesh/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
branches/bmesh/blender/intern/ghost/intern/GHOST_Window.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.h
branches/bmesh/blender/intern/ghost/intern/Makefile
branches/bmesh/blender/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/bmesh/blender/intern/opennl/superlu/sgstrf.c
branches/bmesh/blender/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/blender.sln
branches/bmesh/blender/projectfiles_vc9/blender/blender.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/bmesh/blender/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/bmesh/blender/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/bmesh/blender/release/VERSION
branches/bmesh/blender/release/datafiles/blenderbuttons
branches/bmesh/blender/release/datafiles/datatoc.py
branches/bmesh/blender/release/datafiles/splash.png
branches/bmesh/blender/release/getversion.py
branches/bmesh/blender/release/scripts/io/engine_render_pov.py
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/netrender/balancing.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/model.py
branches/bmesh/blender/release/scripts/io/netrender/operators.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/modules/bpy/__init__.py
branches/bmesh/blender/release/scripts/modules/bpy/ops.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/console/__init__.py
branches/bmesh/blender/release/scripts/modules/console/complete_calltip.py
branches/bmesh/blender/release/scripts/modules/console/complete_import.py
branches/bmesh/blender/release/scripts/modules/console/complete_namespace.py
branches/bmesh/blender/release/scripts/modules/console/intellisense.py
branches/bmesh/blender/release/scripts/modules/rna_prop_ui.py
branches/bmesh/blender/release/scripts/op/add_mesh_torus.py
branches/bmesh/blender/release/scripts/op/mesh.py
branches/bmesh/blender/release/scripts/op/mesh_skin.py
branches/bmesh/blender/release/scripts/op/presets.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/templates/operator.py
branches/bmesh/blender/release/scripts/templates/operator_simple.py
branches/bmesh/blender/release/scripts/ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/ui/properties_data_mesh.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_fluid.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_filebrowser.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_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_view3d.py
branches/bmesh/blender/release/scripts/ui/space_view3d_toolbar.py
branches/bmesh/blender/release/test/rna_array.py
branches/bmesh/blender/source/Makefile
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_action.h
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_colortools.h
branches/bmesh/blender/source/blender/blenkernel/BKE_constraint.h
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_modifier.h
branches/bmesh/blender/source/blender/blenkernel/BKE_multires.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_scene.h
branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sound.h
branches/bmesh/blender/source/blender/blenkernel/BKE_subsurf.h
branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/BKE_writeavi.h
branches/bmesh/blender/source/blender/blenkernel/BKE_writeffmpeg.h
branches/bmesh/blender/source/blender/blenkernel/BKE_writeframeserver.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/CCGSubSurf.c
branches/bmesh/blender/source/blender/blenkernel/intern/CCGSubSurf.h
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_sys.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/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/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/customdata.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/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
branches/bmesh/blender/source/blender/blenkernel/intern/exotic.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.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/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/lattice.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/multires.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/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/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/texture.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeavi.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeframeserver.c
branches/bmesh/blender/source/blender/blenlib/BLI_blenlib.h
branches/bmesh/blender/source/blender/blenlib/BLI_listbase.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_base.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_color.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_matrix.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
branches/bmesh/blender/source/blender/blenlib/SConscript
branches/bmesh/blender/source/blender/blenlib/intern/BLI_bfile.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/listbase.c
branches/bmesh/blender/source/blender/blenlib/intern/math_base.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_matrix.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/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/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/collada/DocumentExporter.cpp
branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
branches/bmesh/blender/source/blender/collada/collada_internal.h
branches/bmesh/blender/source/blender/editors/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/animation/anim_channels_defines.c
branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c
branches/bmesh/blender/source/blender/editors/animation/anim_deps.c
branches/bmesh/blender/source/blender/editors/animation/anim_draw.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/anim_intern.h
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.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/armature_intern.h
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_sketch.c
branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.c
branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.h
branches/bmesh/blender/source/blender/editors/armature/poseSlide.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/curve/curve_intern.h
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/datafiles/B.blend.c
branches/bmesh/blender/source/blender/editors/datafiles/blenderbuttons.c
branches/bmesh/blender/source/blender/editors/datafiles/prvicons.c
branches/bmesh/blender/source/blender/editors/datafiles/splash.png.c
branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.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_anim_api.h
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_keyframes_edit.h
branches/bmesh/blender/source/blender/editors/include/ED_keyframing.h
branches/bmesh/blender/source/blender/editors/include/ED_mball.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_particle.h
branches/bmesh/blender/source/blender/editors/include/ED_screen.h
branches/bmesh/blender/source/blender/editors/include/ED_screen_types.h
branches/bmesh/blender/source/blender/editors/include/ED_sculpt.h
branches/bmesh/blender/source/blender/editors/include/ED_sequencer.h
branches/bmesh/blender/source/blender/editors/include/ED_transform.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/include/UI_view2d.h
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_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/interface/interface_utils.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_ops.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_mods.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.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/mball_edit.c
branches/bmesh/blender/source/blender/editors/metaball/mball_intern.h
branches/bmesh/blender/source/blender/editors/metaball/mball_ops.c
branches/bmesh/blender/source/blender/editors/object/object_add.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_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_transform.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/physics/SConscript
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_intern.h
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/SConscript
branches/bmesh/blender/source/blender/editors/render/render_ops.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/screen/SConscript
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/glutil.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_ops.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
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_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/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_action/action_intern.h
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/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
branches/bmesh/blender/source/blender/editors/space_buttons/space_buttons.c
branches/bmesh/blender/source/blender/editors/space_console/console_intern.h
branches/bmesh/blender/source/blender/editors/space_console/console_ops.c
branches/bmesh/blender/source/blender/editors/space_console/space_console.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_intern.h
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/file_panels.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_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_intern.h
branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_info/space_info.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/nla_buttons.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_channels.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_edit.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_intern.h
branches/bmesh/blender/source/blender/editors/space_nla/nla_ops.c
branches/bmesh/blender/source/blender/editors/space_nla/space_nla.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_ops.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
branches/bmesh/blender/source/blender/editors/space_script/space_script.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.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_intern.h
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/space_sound.c
branches/bmesh/blender/source/blender/editors/space_text/space_text.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
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/space_userpref.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/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/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform.h
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_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/ed_util.c
branches/bmesh/blender/source/blender/editors/util/undo.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_buffers.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/imbuf/intern/divers.c
branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
branches/bmesh/blender/source/blender/imbuf/intern/rectop.c
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_anim_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_armature_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_ipo_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_screen_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
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/intern/Makefile
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_animation.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_animation_api.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_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_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_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.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_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.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_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_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_texture.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_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/nodes/intern/CMP_nodes/CMP_bilateralblur.c
branches/bmesh/blender/source/blender/python/BPY_extern.h
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/generic/vector.c
branches/bmesh/blender/source/blender/python/intern/bpy_array.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_operator_wrap.h
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_util.c
branches/bmesh/blender/source/blender/quicktime/CMakeLists.txt
branches/bmesh/blender/source/blender/quicktime/SConscript
branches/bmesh/blender/source/blender/quicktime/apple/Makefile
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_export.m
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_import.m
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_export.c
branches/bmesh/blender/source/blender/quicktime/quicktime_export.h
branches/bmesh/blender/source/blender/render/SConscript
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
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/occlusion.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/pixelshading.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/strand.c
branches/bmesh/blender/source/blender/render/intern/source/texture.c
branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_cursors.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_gesture.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_subwindow.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
branches/bmesh/blender/source/blender/windowmanager/wm_event_system.h
branches/bmesh/blender/source/blender/windowmanager/wm_event_types.h
branches/bmesh/blender/source/blender/windowmanager/wm_window.h
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_MeshDeformer.h
branches/bmesh/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ModifierDeformer.h
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.h
branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.h
branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_Shader.cpp
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_ConvertPhysicsObjects.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_MouseFocusSensor.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PyMath.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PyMath.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_RayCast.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_RayCast.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.cpp
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/bmesh/blender/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/bmesh/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/bmesh/blender/source/gameengine/PyDoc/GameTypes.py
branches/bmesh/blender/source/gameengine/Rasterizer/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Rasterizer/Makefile
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/bmesh/blender/source/gameengine/Rasterizer/SConscript
branches/bmesh/blender/source/gameengine/VideoTexture/ImageBuff.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageBuff.h
branches/bmesh/blender/source/nan_compile.mk
branches/bmesh/blender/source/nan_link.mk
branches/bmesh/blender/source/tools/MakeCursor.py
branches/bmesh/blender/tools/btools.py
Added Paths:
-----------
branches/bmesh/blender/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/bmesh/blender/intern/audaspace/FX/AUD_RectifyFactory.h
branches/bmesh/blender/intern/audaspace/FX/AUD_RectifyReader.cpp
branches/bmesh/blender/intern/audaspace/FX/AUD_RectifyReader.h
branches/bmesh/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/bmesh/blender/release/scripts/io/netrender/netrender.css
branches/bmesh/blender/release/scripts/io/netrender/netrender.js
branches/bmesh/blender/release/scripts/modules/graphviz_export.py
branches/bmesh/blender/release/scripts/modules/retopo.py
branches/bmesh/blender/release/scripts/modules/rigify/
branches/bmesh/blender/release/scripts/modules/rigify/__init__.py
branches/bmesh/blender/release/scripts/modules/rigify/arm_biped_generic.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/finger_curl.py
branches/bmesh/blender/release/scripts/modules/rigify/leg_biped_generic.py
branches/bmesh/blender/release/scripts/modules/rigify/leg_quadruped_generic.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/spine_pivot_flex.py
branches/bmesh/blender/release/scripts/modules/rigify_utils.py
branches/bmesh/blender/release/scripts/modules/rna_info.py
branches/bmesh/blender/release/scripts/op/add_armature_human.py
branches/bmesh/blender/release/scripts/op/object.py
branches/bmesh/blender/release/scripts/op/screen_play_rendered_anim.py
branches/bmesh/blender/release/scripts/op/uvcalc_follow_active.py
branches/bmesh/blender/release/scripts/presets/sss/apple.py
branches/bmesh/blender/release/scripts/presets/sss/chicken.py
branches/bmesh/blender/release/scripts/presets/sss/cream.py
branches/bmesh/blender/release/scripts/presets/sss/ketchup.py
branches/bmesh/blender/release/scripts/presets/sss/marble.py
branches/bmesh/blender/release/scripts/presets/sss/potato.py
branches/bmesh/blender/release/scripts/presets/sss/skim_milk.py
branches/bmesh/blender/release/scripts/presets/sss/skin1.py
branches/bmesh/blender/release/scripts/presets/sss/skin2.py
branches/bmesh/blender/release/scripts/presets/sss/whole_milk.py
branches/bmesh/blender/release/scripts/ui/properties_data_armature_rigify.py
branches/bmesh/blender/release/scripts/ui/space_dopesheet.py
branches/bmesh/blender/release/scripts/ui/space_graph.py
branches/bmesh/blender/release/scripts/ui/space_nla.py
branches/bmesh/blender/release/test/pep8.py
branches/bmesh/blender/release/text/readme.html
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata_file.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
branches/bmesh/blender/source/blender/blenkernel/intern/customdata_file.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenlib/BLI_path_util.h
branches/bmesh/blender/source/blender/blenlib/BLI_pbvh.h
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_undo.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_armature_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
branches/bmesh/blender/source/blender/python/sphinx_doc_gen.py
branches/bmesh/blender/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
Removed Paths:
-------------
branches/bmesh/blender/release/scripts/modules/rigify/__init__.py
branches/bmesh/blender/release/scripts/modules/rigify/arm_biped_generic.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/finger_curl.py
branches/bmesh/blender/release/scripts/modules/rigify/leg_biped_generic.py
branches/bmesh/blender/release/scripts/modules/rigify/leg_quadruped_generic.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/spine_pivot_flex.py
branches/bmesh/blender/release/scripts/presets/sss/Apple.py
branches/bmesh/blender/release/scripts/presets/sss/Chicken.py
branches/bmesh/blender/release/scripts/presets/sss/Cream.py
branches/bmesh/blender/release/scripts/presets/sss/Ketchup.py
branches/bmesh/blender/release/scripts/presets/sss/Marble.py
branches/bmesh/blender/release/scripts/presets/sss/Potato.py
branches/bmesh/blender/release/scripts/presets/sss/Skim_Milk.py
branches/bmesh/blender/release/scripts/presets/sss/Skin1.py
branches/bmesh/blender/release/scripts/presets/sss/Skin2.py
branches/bmesh/blender/release/scripts/presets/sss/Whole_Milk.py
branches/bmesh/blender/release/text/blender.html
branches/bmesh/blender/source/blender/blenkernel/BKE_sequence.h
branches/bmesh/blender/source/blender/blenkernel/intern/sequence.c
branches/bmesh/blender/source/blender/blenlib/BLI_util.h
branches/bmesh/blender/source/blender/blenlib/intern/util.c
branches/bmesh/blender/source/blender/editors/space_action/action_header.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_header.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_header.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequence.c
branches/bmesh/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_SkinMeshObject.h
Property Changed:
----------------
branches/bmesh/blender/release/scripts/
branches/bmesh/blender/release/scripts/modules/
branches/bmesh/blender/release/scripts/modules/bpy/
branches/bmesh/blender/release/scripts/modules/console/
branches/bmesh/blender/release/scripts/op/
branches/bmesh/blender/release/scripts/presets/
branches/bmesh/blender/release/scripts/presets/cloth/
branches/bmesh/blender/release/scripts/presets/render/
branches/bmesh/blender/release/scripts/presets/sss/
branches/bmesh/blender/release/scripts/templates/
branches/bmesh/blender/tools/bcolors.py
branches/bmesh/blender/tools/btools.py
branches/bmesh/blender/tools/crossmingw.py
branches/bmesh/blender/tools/mstoolkit.py
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2010-01-05 20:47:23 UTC (rev 25756)
+++ branches/bmesh/blender/CMakeLists.txt 2010-01-05 22:33:41 UTC (rev 25757)
@@ -1,4 +1,4 @@
-# $Id$
+ # $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -216,8 +216,8 @@
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
- SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
- SET(OPENCOLLADA_LIB OpenCollada)
+ SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+ SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa Buffer)
SET(OPENCOLLADA_INC ${OPENCOLLADA})
SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
SET(PCRE_LIBPATH ${PCRE}/lib)
@@ -437,7 +437,7 @@
IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.0.0-powerpc)
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
ENDIF(WITH_LIBS10.5)
@@ -531,19 +531,21 @@
SET(LLIBS stdc++ SystemStubs)
IF (WITH_COCOA)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DGHOST_COCOA")
- SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
- IF(USE_QTKIT)
- SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
- SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
- ELSE(USE_QTKIT)
- IF(WITH_QUICKTIME)
- SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
- ENDIF(WITH_QUICKTIME)
- ENDIF(USE_QTKIT)
+ SET(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
+ SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
+ IF(USE_QTKIT)
+ SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
+ SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
+ IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+ #libSDL still needs 32bit carbon quicktime
+ ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ ELSEIF(WITH_QUICKTIME)
+ SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+ ENDIF(USE_QTKIT)
ELSE (WITH_COCOA)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
- SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+ SET(PLATFORM_CFLAGS "-pipe -funsigned-char")
+ SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
ENDIF (WITH_COCOA)
IF(WITH_OPENMP)
@@ -585,13 +587,17 @@
SET(EXETYPE MACOSX_BUNDLE)
-
+ SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
+ SET(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g")
IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
- SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
- SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
ELSEIF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
- SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
- SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ ELSE(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+ SET(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
# Better warnings
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2010-01-05 20:47:23 UTC (rev 25756)
+++ branches/bmesh/blender/SConstruct 2010-01-05 22:33:41 UTC (rev 25757)
@@ -378,7 +378,7 @@
os.makedirs ( B.root_build_dir + 'extern' )
os.makedirs ( B.root_build_dir + 'lib' )
os.makedirs ( B.root_build_dir + 'bin' )
-if not os.path.isdir(B.doc_build_dir):
+if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
os.makedirs ( B.doc_build_dir )
Help(opts.GenerateHelpText(env))
@@ -533,9 +533,10 @@
for tp, tn, tf in os.walk('release/plugins'):
if '.svn' in tn:
tn.remove('.svn')
+ df = tp[8:] # remove 'release/'
for f in tf:
pluglist.append(os.path.join(tp, f))
- plugtargetlist.append( os.path.join(*([BLENDERPATH] + tp.split(os.sep)[1:] + [f])) )
+ plugtargetlist.append( os.path.join(BLENDERPATH, df, f) )
# header files for plugins
@@ -648,12 +649,14 @@
#------------ EPYDOC
if env['WITH_BF_DOCS']:
- try: import epydoc
- except: epydoc = None
-
- if epydoc:
- SConscript('source/gameengine/PyDoc/SConscript')
- else:
- print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
-
+ try:
+ import epydoc
+ except ImportError:
+ epydoc = None
+ if epydoc:
+ SConscript('source/gameengine/PyDoc/SConscript')
+ else:
+ print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
+
+
Modified: branches/bmesh/blender/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/config/darwin-config.py 2010-01-05 20:47:23 UTC (rev 25756)
+++ branches/bmesh/blender/config/darwin-config.py 2010-01-05 22:33:41 UTC (rev 25757)
@@ -40,19 +40,28 @@
# Can be customized
if MACOSX_ARCHITECTURE == 'ppc':
- MAC_MIN_VERS = '10.3'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
- LCGDIR = '#../lib/darwin-6.1-powerpc'
- CC = 'gcc-3.3'
- CXX = 'g++-3.3'
+# ppc release are now made for 10.4
+# MAC_MIN_VERS = '10.3'
+# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+# LCGDIR = '#../lib/darwin-6.1-powerpc'
+# CC = 'gcc-3.3'
+# CXX = 'g++-3.3'
+ MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ LCGDIR = '#../lib/darwin-8.0.0-powerpc'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
elif MACOSX_ARCHITECTURE == 'i386':
MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
LCGDIR = '#../lib/darwin-8.x.i386'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
else :
MAC_MIN_VERS = '10.5'
+ MACOSX_DEPLOYMENT_TARGET = '10.5'
MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
@@ -147,7 +156,7 @@
BF_JACK_LIB = 'jack'
BF_JACK_LIBPATH = '${BF_JACK}/lib'
-WITH_BF_SNDFILE = False
+WITH_BF_SNDFILE = True
BF_SNDFILE = LIBDIR + '/sndfile'
BF_SNDFILE_INC = '${BF_SNDFILE}/include'
BF_SNDFILE_LIB = 'sndfile'
@@ -205,7 +214,7 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-WITH_BF_FFTW3 = False
+WITH_BF_FFTW3 = True
BF_FFTW3 = LIBDIR + '/fftw3'
BF_FFTW3_INC = '${BF_FFTW3}/include'
BF_FFTW3_LIB = 'libfftw3'
@@ -249,7 +258,7 @@
BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
#OpenCollada flags
-WITH_BF_COLLADA = True
+WITH_BF_COLLADA = False
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
@@ -264,6 +273,14 @@
#BF_EXPAT_LIB = 'expat'
#BF_EXPAT_LIBPATH = '/usr/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+if MACOSX_ARCHITECTURE == 'i386':
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+elif MACOSX_ARCHITECTURE == 'x86_64':
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
+
+
#############################################################################
################### various compile settings and flags ##################
#############################################################################
@@ -303,8 +320,8 @@
LLIBS.append('crt3.o')
if USE_SDK==True:
- SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]
- PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK]+PLATFORM_LINKFLAGS
+ SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]
+ PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
CXXFLAGS=SDK_FLAGS+CXXFLAGS
Modified: branches/bmesh/blender/config/linux2-config.py
===================================================================
--- branches/bmesh/blender/config/linux2-config.py 2010-01-05 20:47:23 UTC (rev 25756)
+++ branches/bmesh/blender/config/linux2-config.py 2010-01-05 22:33:41 UTC (rev 25757)
@@ -155,9 +155,9 @@
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = ''
-BF_OPENCOLLADA_LIB = 'OpenCollada'
-BF_OPENCOLLADA_LIBPATH = '/usr/lib'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre Buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
BF_PCRE = ''
BF_PCRE_LIB = 'pcre'
BF_PCRE_LIBPATH = '/usr/lib'
@@ -167,6 +167,10 @@
WITH_BF_OPENMP = True
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list