diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:55:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:55:51 +0300 |
| commit | 87b2444270403b9a826f564ddf58a310dcab2324 (patch) | |
| tree | 6db02468dcb3f42338914d62f0dba9e6f73c6bf1 /source/blender/depsgraph/intern/depsgraph_tag.cc | |
| parent | 0626de2033c45c1973f5233ab137098db4b38be3 (diff) | |
| parent | fd19069999e3655206ccf21dc851801a325dea5d (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ArmatureImporter.h
source/blender/collada/ControllerExporter.cpp
source/blender/collada/ControllerExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/GeometryExporter.h
source/blender/collada/MeshImporter.cpp
source/blender/collada/MeshImporter.h
source/blender/collada/SkinInfo.cpp
source/blender/collada/SkinInfo.h
source/blender/collada/collada_utils.cpp
source/blender/collada/collada_utils.h
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_tag.cc')
0 files changed, 0 insertions, 0 deletions