svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
authorNathan Letwory <nathan@letworyinteractive.com>
Fri, 29 Jul 2011 07:58:03 +0000 (07:58 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Fri, 29 Jul 2011 07:58:03 +0000 (07:58 +0000)
commit24def76ac899e106b4a04364504ba0cbc100d7f7
tree150a4593cbd3054ab5f10df2ccda6a0fb0c82cd9
parentd55f6c64a24c9e8e46f2a7d33da17aff24ce6d1a
svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
42 files changed:
build_files/cmake/cmake_consistency_check.py
build_files/cmake/cmake_netbeans_project.py
build_files/cmake/cmake_qtcreator_project.py
doc/python_api/examples/bge.constraints.py
doc/python_api/examples/bge.texture.1.py
doc/python_api/examples/bge.texture.py
doc/python_api/examples/blf.py
doc/python_api/sphinx_doc_gen.sh
release/scripts/modules/addon_utils.py
release/scripts/modules/bpy/__init__.py
release/scripts/modules/bpy_extras/io_utils.py
release/scripts/modules/bpy_extras/mesh_utils.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_operators/object_align.py
release/scripts/startup/bl_operators/screen_play_rendered_anim.py
release/scripts/startup/bl_ui/properties_data_empty.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_world.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_node.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
release/scripts/templates/batch_export.py
release/scripts/templates/ui_menu.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/multires.c
source/blender/collada/MaterialExporter.cpp
source/blender/collada/MaterialExporter.h
source/blender/editors/interface/resources.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator.c
source/tests/check_deprecated.py