diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-01 15:34:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-01 15:34:11 +0300 |
| commit | 11af9e9a5bd1caff1ec46794bda2934a01ce5035 (patch) | |
| tree | d4f76f59c5f6398a07a36eb8e99558e6f4a84b8d /source/creator | |
| parent | faec4309147988fbab7b7d7ec661f5130358d169 (diff) | |
| parent | b08473680e141ab6f28f99fc3b1dbbc4add89bed (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_particles.cpp
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph_build.cc
Diffstat (limited to 'source/creator')
0 files changed, 0 insertions, 0 deletions