[Bf-blender-cvs] [f512c8c2a80] datablock_idprops: Merge branch 'master' into datablock_idprops

Bastien Montagne noreply at git.blender.org
Wed Mar 29 16:30:18 CEST 2017


Commit: f512c8c2a80bbb217683b8d61560d97bd96b5662
Author: Bastien Montagne
Date:   Tue Mar 28 15:51:14 2017 +0200
Branches: datablock_idprops
https://developer.blender.org/rBf512c8c2a80bbb217683b8d61560d97bd96b5662

Merge branch 'master' into datablock_idprops

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 9078ad6cc7b,09c88ac945a..57f21e41530
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -2799,14 -2767,18 +2799,18 @@@ static void lib_link_ntree(FileData *fd
  	for (node = ntree->nodes.first; node; node = node->next) {
  		/* Link ID Properties -- and copy this comment EXACTLY for easy finding
  		 * of library blocks that implement this.*/
 -		IDP_LibLinkProperty(node->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
 +		IDP_LibLinkProperty(node->prop, fd);
  		
- 		node->id= newlibadr_us(fd, id->lib, node->id);
+ 		node->id = newlibadr_us(fd, id->lib, node->id);
  
- 		for (sock = node->inputs.first; sock; sock = sock->next)
+ 		for (sock = node->inputs.first; sock; sock = sock->next) {
+ 			IDP_LibLinkProperty(sock->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
  			lib_link_node_socket(fd, id, sock);
- 		for (sock = node->outputs.first; sock; sock = sock->next)
+ 		}
+ 		for (sock = node->outputs.first; sock; sock = sock->next) {
+ 			IDP_LibLinkProperty(sock->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
  			lib_link_node_socket(fd, id, sock);
+ 		}
  	}
  	
  	for (sock = ntree->inputs.first; sock; sock = sock->next) {




More information about the Bf-blender-cvs mailing list