Merged from trunk with revision range 36835-37865,
authorJason Hays <jason_hays22@mymail.eku.edu>
Mon, 27 Jun 2011 17:21:08 +0000 (17:21 +0000)
committerJason Hays <jason_hays22@mymail.eku.edu>
Mon, 27 Jun 2011 17:21:08 +0000 (17:21 +0000)
commit84ea89e25feaeff8eeaf5ebe35c0a76203670569
treeb85158536330b76a9b7445028e04a06d7579ea09
parent1876b592daffb86a60890b9f8db55d676d7cae1c
parent8e90ba3b201f58496b3bec39d98963ab77182736
Merged from trunk with revision range 36835-37865,
(No conflicts had to be manually resolved)
Gave weight paint a basic ability to draw edges and vertices with an option
 (with colors for selected/unselected),
but I didn't make any vertex selection functions available in weight paint mode yet
(tested with edit mode for now).
50 files changed:
CMakeLists.txt
GNUmakefile
build_files/cmake/macros.cmake
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
doc/python_api/rst/change_log.rst
doc/python_api/sphinx_doc_gen.py
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_WindowCocoa.h
intern/ghost/intern/GHOST_WindowCocoa.mm
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/sound.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/BPY_extern.h
source/blender/python/generic/mathutils_Matrix.c
source/blender/python/generic/mathutils_geometry.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/volumetric.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator.c