Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 10:57:24 +0000 (12:57 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 10:57:24 +0000 (12:57 +0200)
commit9b4e56c091f0df255cc09607061d130847a5f438
tree061dec5b7a2df3d560dcdb9bf70e5878e8fb6279
parentd41bf6b8e8e9b00262cfb5547fda376e620eb864
parent28369f725c10f167e504f0acd695a0f9d3c2a709
Merge branch 'master' into blender2.8

 Conflicts:
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_constraint.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_pose.c