diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/freestyle/intern/system/Id.h | |
parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle/intern/system/Id.h')
-rw-r--r-- | source/blender/freestyle/intern/system/Id.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/system/Id.h b/source/blender/freestyle/intern/system/Id.h index 8b028cdb3da..279730f7934 100644 --- a/source/blender/freestyle/intern/system/Id.h +++ b/source/blender/freestyle/intern/system/Id.h @@ -78,7 +78,7 @@ public: _first = iBrother._first; _second = iBrother._second; return *this; - } + } /*! Returns the first Id number */ id_type getFirst() const |