diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-05 11:02:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-05 11:02:25 +0300 |
| commit | e9bb018a4aea1b4aeb692cdadce158496a270e32 (patch) | |
| tree | 9f8c122feb8a68cc34f5ab6c99407a20d72fa50d /source/blender/alembic/intern/abc_exporter.h | |
| parent | 4dadb6d4453d84d537e25e753f7904ce5c8539fb (diff) | |
| parent | 8647d5af9015097698984e9864802848914e803c (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/alembic/intern/abc_exporter.h
Diffstat (limited to 'source/blender/alembic/intern/abc_exporter.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_exporter.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h index 80fee067c04..cf2a3432da9 100644 --- a/source/blender/alembic/intern/abc_exporter.h +++ b/source/blender/alembic/intern/abc_exporter.h @@ -28,6 +28,8 @@ #include <set> #include <vector> +#include "abc_util.h" + class AbcObjectWriter; class AbcTransformWriter; class ArchiveWriter; @@ -44,6 +46,7 @@ struct ExportSettings { Scene *scene; SceneLayer *sl; // Scene layer to export; all its objects will be exported, unless selected_only=true + SimpleLogger logger; bool selected_only; bool visible_layers_only; |