diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:58:31 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:58:31 +0300 |
commit | 43eebdfebd6e31d188ae3c1b220c8991fc869df3 (patch) | |
tree | 5adc929ce792f2dfd74276838e63d91fcddb9a1c /CMakeLists.txt | |
parent | c98b2e74df2e531726f5ceabe76342282f695f23 (diff) | |
parent | be57cf9b2a0e1be577211839487cacd288886c1a (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
Diffstat (limited to 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions