diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /source/blender/editors/io/io_ops.c | |
parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'source/blender/editors/io/io_ops.c')
-rw-r--r-- | source/blender/editors/io/io_ops.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c index a33340cc39a..a70a51a60be 100644 --- a/source/blender/editors/io/io_ops.c +++ b/source/blender/editors/io/io_ops.c @@ -28,16 +28,13 @@ * \ingroup collada */ - -#include "io_collada.h" - -#include "BLI_utildefines.h" - -#include "WM_types.h" -#include "WM_api.h" - #include "io_ops.h" /* own include */ +#ifdef WITH_COLLADA +# include "io_collada.h" +# include "WM_api.h" +#endif + void ED_operatortypes_io(void) { #ifdef WITH_COLLADA |