[Bf-blender-cvs] [a7efdc14a16] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: a7efdc14a161a9110e3bbf844570334f1298bd88
Author: Sergey Sharybin
Date:   Thu Dec 21 17:17:27 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa7efdc14a161a9110e3bbf844570334f1298bd88

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
index 3e20196c2ea,e92c7730482..b889ebf8a8f
--- a/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
@@@ -78,9 -97,21 +97,21 @@@ void write_stats_data(const DebugContex
  		if (time == 0.0) {
  			continue;
  		}
+ 		StatsEntry entry;
+ 		entry.id_node = id_node;
+ 		entry.time = time;
+ 		stats.push_back(entry);
+ 	}
+ 	// Sort the data.
+ 	std::sort(stats.begin(), stats.end(), stat_entry_comparator);
+ 	// We limit number of entries, otherwise things become unreadable.
+ 	stats.resize(min_ii(stats.size(), 32));
+ 	// Print data to the file stream.
+ 	deg_debug_fprintf(ctx, "$data << EOD" NL);
+ 	foreach (const StatsEntry& entry, stats) {
  		deg_debug_fprintf(ctx, "\"%s\",%f" NL,
 -		                  entry.id_node->id->name + 2,
 +		                  id_node->id_orig->name + 2,
- 		                  time);
+ 		                  entry.time);
  	}
  	deg_debug_fprintf(ctx, "EOD" NL);
  }