Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 18 Mar 2018 15:05:02 +0000 (16:05 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 18 Mar 2018 15:05:02 +0000 (16:05 +0100)
commite95282e783f2cebb700c354ad181dd5efce50d04
treec775ea102783f363b90469f2cf5ba2bad1da4f79
parent4a3d94c0734d1475aa9a2fbe89039fbc59c9fb8d
parent0301df40e5b6c51575d7f9013a1a28b901063829
Merge branch 'master' into blender2.8
CMakeLists.txt
source/blender/editors/mesh/meshtools.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/makesrna/intern/rna_smoke.c