Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Apr 2018 10:03:09 +0000 (12:03 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Apr 2018 10:03:09 +0000 (12:03 +0200)
commit9e2ea6c500a3a5774a1aa174b6801d3a9edadd9a
tree25e8fd41033e82b6cb04a00b52390f899dc085e5
parentf3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689
parent0f2efce6c50718d7745a6dc1613acf62a186cc05
Merge branch 'master' into blender2.8
28 files changed:
source/blender/blenkernel/intern/action.c
source/blender/collada/ArmatureImporter.cpp
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/armature_naming.c
source/blender/editors/armature/armature_relations.c
source/blender/editors/armature/armature_select.c
source/blender/editors/armature/armature_skinning.c
source/blender/editors/armature/armature_utils.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/armature/meshlaplacian.h
source/blender/editors/armature/pose_select.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_add.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_context.c
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/ed_transverts.c
source/blender/makesrna/intern/rna_armature.c
source/blenderplayer/bad_level_call_stubs/stubs.c