diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:21:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:22:52 +0300 |
commit | aba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch) | |
tree | 2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/freestyle/intern/system | |
parent | 72a563cdee8fef198a200ff65b57ddb847c01795 (diff) |
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/freestyle/intern/system')
-rw-r--r-- | source/blender/freestyle/intern/system/Cast.h | 3 | ||||
-rw-r--r-- | source/blender/freestyle/intern/system/Id.h | 6 | ||||
-rw-r--r-- | source/blender/freestyle/intern/system/RenderMonitor.h | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/system/Cast.h b/source/blender/freestyle/intern/system/Cast.h index 8318633c4b5..44fd86a9b43 100644 --- a/source/blender/freestyle/intern/system/Cast.h +++ b/source/blender/freestyle/intern/system/Cast.h @@ -27,8 +27,9 @@ namespace Freestyle { namespace Cast { template<class T, class U> U *cast(T *in) { - if (!in) + if (!in) { return NULL; + } return dynamic_cast<U *>(in); } } // end of namespace Cast diff --git a/source/blender/freestyle/intern/system/Id.h b/source/blender/freestyle/intern/system/Id.h index 9a83ae27767..549def6cabb 100644 --- a/source/blender/freestyle/intern/system/Id.h +++ b/source/blender/freestyle/intern/system/Id.h @@ -112,10 +112,12 @@ class Id { /*! Operator< */ bool operator<(const Id &id) const { - if (_first < id._first) + if (_first < id._first) { return true; - if (_first == id._first && _second < id._second) + } + if (_first == id._first && _second < id._second) { return true; + } return false; } diff --git a/source/blender/freestyle/intern/system/RenderMonitor.h b/source/blender/freestyle/intern/system/RenderMonitor.h index 8058ab1b7ff..709df6c2d8e 100644 --- a/source/blender/freestyle/intern/system/RenderMonitor.h +++ b/source/blender/freestyle/intern/system/RenderMonitor.h @@ -54,8 +54,9 @@ class RenderMonitor { inline void progress(float i) { - if (_re) + if (_re) { _re->progress(_re->prh, i); + } } inline bool testBreak() |