diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-06 05:04:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-06 05:04:48 +0300 |
| commit | 13f77de21463a4406edf1e387bb4a7b9735c5a72 (patch) | |
| tree | 892e6c49367791da76efb73e7e06033ce47c0be1 /source/blender/alembic/intern/abc_util.cc | |
| parent | e63ba6d0f422bd55a5d3cbdb0d835e8839d2d6b6 (diff) | |
| parent | 5e3b6e951b0914010396257b723b1d5331433719 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern/abc_util.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 6b82bc2dee6..41cc53b0716 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -531,7 +531,7 @@ ScopeTimer::~ScopeTimer() bool SimpleLogger::empty() { - return m_stream.tellp() == 0ul; + return ((size_t)m_stream.tellp()) == 0ul; } std::string SimpleLogger::str() const |