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

Sybren A. Stüvel noreply at git.blender.org
Thu Nov 2 14:37:45 CET 2017


Commit: f7d59fbc460cd2e544c855d8088c98aacf90cfdd
Author: Sybren A. Stüvel
Date:   Thu Nov 2 14:37:10 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBf7d59fbc460cd2e544c855d8088c98aacf90cfdd

Merge branch 'master' into blender2.8

# Conflicts:
#	tests/gtests/alembic/abc_export_test.cc

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



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

diff --cc tests/gtests/alembic/abc_export_test.cc
index 78622dcf8a0,a3eb2c412df..6fc976b8a55
--- a/tests/gtests/alembic/abc_export_test.cc
+++ b/tests/gtests/alembic/abc_export_test.cc
@@@ -43,7 -37,7 +43,8 @@@ protected
  	ExportSettings settings;
  	Scene scene;
  	TestableAbcExporter *exporter;
 +	EvaluationContext eval_ctx;
+ 	Main *bmain;
  
  	virtual void SetUp()
  	{



More information about the Bf-blender-cvs mailing list