[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41921] trunk/blender/intern/cycles/ blender/blender_util.h: Fix #29292: cycles not loading linked image datablocks correctly.

[Brecht Van Lommel]

Revision: 41921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41921
Author:   blendix
Date:     2011-11-16 16:10:11 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Fix #29292: cycles not loading linked image datablocks correctly.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_util.h

Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h	2011-11-16 16:08:45 UTC (rev 41920)
+++ trunk/blender/intern/cycles/blender/blender_util.h	2011-11-16 16:10:11 UTC (rev 41921)
@@ -176,7 +176,13 @@
 static inline string blender_absolute_path(BL::BlendData b_data, BL::ID b_id, const string& path)
 {
 	if(path.size() >= 2 && path[0] == '/' && path[1] == '/') {
-		string dirname = (b_id.library())? b_id.library().filepath(): b_data.filepath();
+		string dirname;
+		
+		if(b_id.library())
+			dirname = blender_absolute_path(b_data, b_id.library(), b_id.library().filepath());
+		else
+			dirname = b_data.filepath();
+
 		return path_join(path_dirname(dirname), path.substr(2));
 	}