Bastien Montagne
2a7f8d3cb3
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/rand.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/makesrna/intern/rna_mask.c
2017-11-15 10:46:19 +01:00
..
2017-11-13 11:48:48 -02:00
2017-10-07 15:57:14 +11:00
2017-10-23 22:22:22 +03:00
2017-11-15 10:46:19 +01:00
2017-10-29 15:14:04 +01:00
2017-03-18 12:19:03 +11:00
2017-08-18 08:45:41 +10:00
2014-09-17 18:36:17 +10:00
2012-03-16 21:39:56 +00:00