Merge branch 'blender2.8' into tmp-static-override-insertion
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 4 May 2018 13:26:02 +0000 (15:26 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 4 May 2018 13:26:02 +0000 (15:26 +0200)
commit10fb83e3f06f80a2e6ec19c4f46f41721e2142a6
tree313df01965355532ae462f2bf06aa9b044d1a4dd
parent49407122ea6852704a43cc2df5de0f5179758491
parent0a79de526d41e9880ee9d4f4b25fabd0fecdb3a4
Merge branch 'blender2.8' into tmp-static-override-insertion
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/modifier.c