diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 00:39:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 00:39:59 +0300 |
| commit | 6af997710bf8bf48381bebe73d01d8c521a014ac (patch) | |
| tree | 84cc30df0a266f31858e40e20c8d178206626116 /intern/cycles/render | |
| parent | c754b2239c065a76386df211daf365da6ed56312 (diff) | |
| parent | 8ac2d85d2fd3f8b997e9c9bddadada0dc7bdaf37 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/stats.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/stats.cpp b/intern/cycles/render/stats.cpp index 71d9353ad3d..9a7c5a6c1ad 100644 --- a/intern/cycles/render/stats.cpp +++ b/intern/cycles/render/stats.cpp @@ -133,7 +133,7 @@ string NamedNestedSampleStats::full_report(int indent_level, uint64_t total_samp sum_seconds, self_percent, self_seconds); - string result = indent + info; + string result = indent + info; sort(entries.begin(), entries.end(), namedTimeSampleEntryComparator); foreach(NamedNestedSampleStats& entry, entries) { |