diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-09 23:51:23 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-09 23:51:23 +0300 |
| commit | 168a6a4bfc13cbe5c2fb510607b9565de3eb9472 (patch) | |
| tree | 1614102a8c5355c6e37020840b4492f6857990c7 /source/blender/makesdna/DNA_space_types.h | |
| parent | 879877295d0785aef0b47ebc031a06dd2f17a63f (diff) | |
| parent | d7ef1af22bf48f00607ba86e1344e1467e6e5e53 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesrna/intern/rna_dynamicpaint.c
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
0 files changed, 0 insertions, 0 deletions