[Bf-blender-cvs] [546a0e2] master: Fix T44989: Crash on linking external OSL material

[Sergey Sharybin]

Commit: 546a0e2d967ffa1a4cdf60c29fa57b2b5d4c9bbc
Author: Sergey Sharybin
Date:   Sun Jun 7 21:38:46 2015 +0200
Branches: master
https://developer.blender.org/rB546a0e2d967ffa1a4cdf60c29fa57b2b5d4c9bbc

Fix T44989: Crash on linking external OSL material

Issue was caused by passing NULL bmain to the path remap function when
localizing the node tree.

Paths are to be remapped, otherwise mapping of paths to OSL scripts
might happen in a wrong way.

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

M	source/blender/blenkernel/intern/node.c

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

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 69905fa..18d29af 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1980,7 +1980,7 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree)
 		/* Make full copy.
 		 * Note: previews are not copied here.
 		 */
-		ltree = ntreeCopyTree_internal(ntree, NULL, false, false, false);
+		ltree = ntreeCopyTree_internal(ntree, G.main, false, false, false);
 		ltree->flag |= NTREE_IS_LOCALIZED;
 		
 		for (node = ltree->nodes.first; node; node = node->next) {