diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
commit | 58d6cbba6da31db8dc8a2b42d528b9a353081904 (patch) | |
tree | 04b57a2f809c6f08d84a082edf061f3ece631860 /source/blender/collada/GeometryExporter.h | |
parent | 94549adec4b6857fb6ec4cf77606da51ff7c26b7 (diff) | |
parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) |
Merge branch 'master' into temp-ghash-setopstemp-ghash-setops
Diffstat (limited to 'source/blender/collada/GeometryExporter.h')
-rw-r--r-- | source/blender/collada/GeometryExporter.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/source/blender/collada/GeometryExporter.h b/source/blender/collada/GeometryExporter.h index 4d54e79d796..69d1067e6f4 100644 --- a/source/blender/collada/GeometryExporter.h +++ b/source/blender/collada/GeometryExporter.h @@ -48,6 +48,20 @@ extern Object *bc_get_highest_selected_ancestor_or_self(Object *ob); +class Normal +{ + public: + float x; + float y; + float z; + + friend bool operator< (const Normal &, const Normal &); + +}; + +bool operator< (const Normal &, const Normal &); + + // TODO: optimize UV sets by making indexed list with duplicates removed class GeometryExporter : COLLADASW::LibraryGeometries { @@ -56,10 +70,7 @@ class GeometryExporter : COLLADASW::LibraryGeometries unsigned int v1, v2, v3, v4; }; - struct Normal - { - float x, y, z; - }; + Normal n; Scene *mScene; |