[Bf-blender-cvs] [97cb967] asset-engine: Merge branch 'master' into asset-engine

Bastien Montagne noreply at git.blender.org
Thu Mar 17 14:54:55 CET 2016


Commit: 97cb96720cd98bf3da30b2c94b7d3b057875d49f
Author: Bastien Montagne
Date:   Thu Mar 17 12:51:53 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB97cb96720cd98bf3da30b2c94b7d3b057875d49f

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/blenkernel/intern/blender.c

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



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

diff --cc source/blender/blenkernel/intern/blender.c
index 878c189,baf93ff..ed1947e
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@@ -553,10 -539,7 +564,10 @@@ int BKE_read_file(bContext *C, const ch
  			retval = BKE_READ_FILE_FAIL;
  		}
  		else {
- 			setup_app_data(C, bfd, filepath);  // frees BFD
+ 			setup_app_data(C, bfd, filepath, reports);
 +
 +			printf("Updating assets for: %s\n", filepath);
 +			read_file_update_assets(C);
  		}
  	}
  	else




More information about the Bf-blender-cvs mailing list