[Bf-blender-cvs] [fe2cfed] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: fe2cfed20c8302d955a38c55422fcaca6d19dd94
Author: Kévin Dietrich
Date:   Thu Jul 7 13:23:12 2016 +0200
Branches: openvdb
https://developer.blender.org/rBfe2cfed20c8302d955a38c55422fcaca6d19dd94

Merge branch 'master' into openvdb

Conflicts:
	source/blender/blenloader/intern/writefile.c

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index af6a3be,a761a56..dbe2ff0
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -886,79 -973,91 +973,98 @@@ static void write_nodetree(WriteData *w
  	bNode *node;
  	bNodeSocket *sock;
  	bNodeLink *link;
- 	
+ 
  	/* for link_list() speed, we write per list */
- 	
- 	if (ntree->adt) write_animdata(wd, ntree->adt);
- 	
+ 
+ 	if (ntree->adt) {
+ 		write_animdata(wd, ntree->adt);
+ 	}
+ 
  	for (node = ntree->nodes.first; node; node = node->next) {
- 		writestruct(wd, DATA, "bNode", 1, node);
+ 		writestruct(wd, DATA, bNode, 1, node);
  
- 		if (node->prop)
+ 		if (node->prop) {
  			IDP_WriteProperty(node->prop, wd);
+ 		}
  
- 		for (sock= node->inputs.first; sock; sock= sock->next)
+ 		for (sock = node->inputs.first; sock; sock = sock->next) {
  			write_node_socket(wd, ntree, node, sock);
- 		for (sock= node->outputs.first; sock; sock= sock->next)
+ 		}
+ 		for (sock = node->outputs.first; sock; sock = sock->next) {
  			write_node_socket(wd, ntree, node, sock);
- 		
- 		for (link = node->internal_links.first; link; link = link->next)
- 			writestruct(wd, DATA, "bNodeLink", 1, link);
+ 		}
+ 
+ 		for (link = node->internal_links.first; link; link = link->next) {
+ 			writestruct(wd, DATA, bNodeLink, 1, link);
+ 		}
+ 
  		if (node->storage) {
  			/* could be handlerized at some point, now only 1 exception still */
- 			if (ntree->type==NTREE_SHADER) {
- 				if (node->type==SH_NODE_CURVE_VEC || node->type==SH_NODE_CURVE_RGB)
- 					write_curvemapping(wd, node->storage);
- 				else if (node->type==SH_NODE_SCRIPT) {
- 					NodeShaderScript *nss = (NodeShaderScript *)node->storage;
- 					if (nss->bytecode)
- 						writedata(wd, DATA, strlen(nss->bytecode)+1, nss->bytecode);
- 					writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
- 				}
- 				else if (node->type==SH_NODE_OPENVDB) {
- 					NodeShaderOpenVDB *vdb = (NodeShaderOpenVDB *)node->storage;
- 					writelist(wd, DATA, "OpenVDBGridInfo", &vdb->grid_info);
- 					writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
- 				}
- 				else
- 					writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
+ 			if ((ntree->type == NTREE_SHADER) &&
+ 			    ELEM(node->type, SH_NODE_CURVE_VEC, SH_NODE_CURVE_RGB))
+ 			{
+ 				write_curvemapping(wd, node->storage);
  			}
- 			else if (ntree->type==NTREE_COMPOSIT) {
- 				if (ELEM(node->type, CMP_NODE_TIME, CMP_NODE_CURVE_VEC, CMP_NODE_CURVE_RGB, CMP_NODE_HUECORRECT))
- 					write_curvemapping(wd, node->storage);
- 				else if (node->type==CMP_NODE_MOVIEDISTORTION) {
- 					/* pass */
+ 			else if (ntree->type == NTREE_SHADER &&
+ 			         (node->type == SH_NODE_SCRIPT))
+ 			{
+ 				NodeShaderScript *nss = (NodeShaderScript *)node->storage;
+ 				if (nss->bytecode) {
+ 					writedata(wd, DATA, strlen(nss->bytecode) + 1, nss->bytecode);
  				}
- 				else
- 					writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
+ 				writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
  			}
- 			else if (ntree->type==NTREE_TEXTURE) {
- 				if (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME)
- 					write_curvemapping(wd, node->storage);
- 				else
- 					writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
++			else if (ntree->type == NTREE_SHADER &&
++			         (node->type == SH_NODE_OPENVDB))
++			{
++				NodeShaderOpenVDB *vdb = (NodeShaderOpenVDB *)node->storage;
++				writelist(wd, DATA, "OpenVDBGridInfo", &vdb->grid_info);
++				writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
++			}
+ 			else if ((ntree->type == NTREE_COMPOSIT) &&
+ 			         ELEM(node->type, CMP_NODE_TIME, CMP_NODE_CURVE_VEC, CMP_NODE_CURVE_RGB, CMP_NODE_HUECORRECT))
+ 			{
+ 				write_curvemapping(wd, node->storage);
+ 			}
+ 			else if ((ntree->type == NTREE_TEXTURE) &&
+ 			         (node->type == TEX_NODE_CURVE_RGB || node->type == TEX_NODE_CURVE_TIME))
+ 			{
+ 				write_curvemapping(wd, node->storage);
+ 			}
+ 			else if ((ntree->type == NTREE_COMPOSIT) &&
+ 			         (node->type == CMP_NODE_MOVIEDISTORTION))
+ 			{
+ 				/* pass */
+ 			}
+ 			else {
+ 				writestruct_id(wd, DATA, node->typeinfo->storagename, 1, node->storage);
  			}
  		}
- 		
- 		if (node->type==CMP_NODE_OUTPUT_FILE) {
+ 
+ 		if (node->type == CMP_NODE_OUTPUT_FILE) {
  			/* inputs have own storage data */
- 			for (sock = node->inputs.first; sock; sock = sock->next)
- 				writestruct(wd, DATA, "NodeImageMultiFileSocket", 1, sock->storage);
+ 			for (sock = node->inputs.first; sock; sock = sock->next) {
+ 				writestruct(wd, DATA, NodeImageMultiFileSocket, 1, sock->storage);
+ 			}
  		}
- 		if (node->type==CMP_NODE_IMAGE) {
+ 		if (node->type == CMP_NODE_IMAGE) {
  			/* write extra socket info */
- 			for (sock = node->outputs.first; sock; sock = sock->next)
- 				writestruct(wd, DATA, "NodeImageLayer", 1, sock->storage);
+ 			for (sock = node->outputs.first; sock; sock = sock->next) {
+ 				writestruct(wd, DATA, NodeImageLayer, 1, sock->storage);
+ 			}
  		}
  	}
- 	
- 	for (link= ntree->links.first; link; link= link->next)
- 		writestruct(wd, DATA, "bNodeLink", 1, link);
- 	
- 	for (sock = ntree->inputs.first; sock; sock = sock->next)
+ 
+ 	for (link = ntree->links.first; link; link = link->next) {
+ 		writestruct(wd, DATA, bNodeLink, 1, link);
+ 	}
+ 
+ 	for (sock = ntree->inputs.first; sock; sock = sock->next) {
  		write_node_socket_interface(wd, ntree, sock);
- 	for (sock = ntree->outputs.first; sock; sock = sock->next)
+ 	}
+ 	for (sock = ntree->outputs.first; sock; sock = sock->next) {
  		write_node_socket_interface(wd, ntree, sock);
+ 	}
  }
  
  /**