diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
| commit | 1c7cfa025c87e8f31790b48cbb189949f7949ad1 (patch) | |
| tree | 3869d475a9d10c005b0bb8006eb77bf55f1903d3 /source/blender/collada/DocumentImporter.cpp | |
| parent | 46f518e92790a04885f4e047bb59b11019d73aa3 (diff) | |
| parent | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index d3e23f740c8..ec9a4169b26 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -62,7 +62,6 @@ 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" |