diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-12-07 20:00:03 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-12-07 20:00:03 +0300 |
| commit | dc848e9a8b6486ea83461c67c068a9ae8ac154ae (patch) | |
| tree | 2cd74e4b46f24370a900bcbfbdfa0acc30d9e3cc /source/blender/collada | |
| parent | 1c0905be0f6c36524adeb43237d9541bb1e6dc1e (diff) | |
| parent | 237df2f86053e796da98c903185ec3d70ae13910 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index ec9a4169b26..d3e23f740c8 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -62,6 +62,7 @@ extern "C" { #include "BKE_layer.h" #include "BKE_lamp.h" #include "BKE_library.h" +#include "BKE_texture.h" #include "BKE_fcurve.h" #include "BKE_scene.h" #include "BKE_global.h" |