diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/collada/GeometryExporter.h | |
parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/GeometryExporter.h')
-rw-r--r-- | source/blender/collada/GeometryExporter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/GeometryExporter.h b/source/blender/collada/GeometryExporter.h index 5d74124b07a..e47b3f4eee8 100644 --- a/source/blender/collada/GeometryExporter.h +++ b/source/blender/collada/GeometryExporter.h @@ -128,7 +128,7 @@ private: const ExportSettings *export_settings; - Mesh * get_mesh(Scene *sce, Object *ob, int apply_modifiers); + Mesh *get_mesh(Scene *sce, Object *ob, int apply_modifiers); }; struct GeometryFunctor { |