Merged 37865-38124
authorJason Hays <jason_hays22@mymail.eku.edu>
Wed, 6 Jul 2011 13:49:47 +0000 (13:49 +0000)
committerJason Hays <jason_hays22@mymail.eku.edu>
Wed, 6 Jul 2011 13:49:47 +0000 (13:49 +0000)
commit7858d9348e58546d14f7c5e0c59929ff025cc7b4
tree6c8f527f7fb26053e3b41e0149a86fd72e0f8415
parent5d720bb98d942faae5cfe6498f147946a6d763fd
parent33afa06412e3fed21c1afa806e9a8a7f91c18c9e
Merged 37865-38124
17 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_material.py
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/editors/armature/armature_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/generic/mathutils_geometry.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_files.c
source/creator/creator.c