diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
| commit | 908b6960c01ffb1665af56ff6f03aaa3eac5366a (patch) | |
| tree | db609864fbe601073212b4c37541a7965ea96ea5 /source/blender/collada/SceneExporter.h | |
| parent | d352a0adc5dadd0bfdc3b1b1ac76d92be689966b (diff) | |
| parent | a25c11fd8d602236f36c34c342453149bdc1d909 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/SceneExporter.h')
| -rw-r--r-- | source/blender/collada/SceneExporter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/SceneExporter.h b/source/blender/collada/SceneExporter.h index 24a2dcf08c8..91f98063020 100644 --- a/source/blender/collada/SceneExporter.h +++ b/source/blender/collada/SceneExporter.h @@ -102,7 +102,7 @@ private: friend class ArmatureExporter; void exportHierarchy(bContext *C, struct Depsgraph *depsgraph, Scene *sce); void writeNodes(bContext *C, struct Depsgraph *depsgraph, Object *ob, Scene *sce); - + ArmatureExporter *arm_exporter; const ExportSettings *export_settings; }; |