svn merge ^/trunk/blender -r43564:43609
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jan 2012 18:04:35 +0000 (18:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jan 2012 18:04:35 +0000 (18:04 +0000)
commit4966982a5aa7715e6bd67dcef1babdf8ca3d02e9
treecf96f67b83f89336e3fe2f64aa58345dca818430
parent0198df7956125180d5b9c50638a0778a3236d88f
parentdf51fd74cf826c42a90212082abb27e99484257a
svn merge ^/trunk/blender -r43564:43609
28 files changed:
build_files/cmake/cmake_static_check_cppcheck.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/ED_object.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/convertblender.c