[Durian-svn] [2947] Fixed wrong links

[dolf]

Revision: 2947
          https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=2947
Author:   dolf
Date:     2010-05-06 10:12:56 +0200 (Thu, 06 May 2010)
Log Message:
-----------
Fixed wrong links

Modified Paths:
--------------
    pro/env_city/bedroom.blend
    pro/env_city/ishtar.blend
    pro/env_city/ziggurat.blend
    pro/scenes/04.1_ziggurat/04.1a_comp.blend
    pro/scenes/04.1_ziggurat/04.1b_comp.blend
    pro/scripts/utilities/findLibError.py
    pro/scripts/utilities/findPathError.py

Modified: pro/env_city/bedroom.blend
===================================================================
(Binary files differ)

Modified: pro/env_city/ishtar.blend
===================================================================
(Binary files differ)

Modified: pro/env_city/ziggurat.blend
===================================================================
(Binary files differ)

Modified: pro/scenes/04.1_ziggurat/04.1a_comp.blend
===================================================================
(Binary files differ)

Modified: pro/scenes/04.1_ziggurat/04.1b_comp.blend
===================================================================
(Binary files differ)

Modified: pro/scripts/utilities/findLibError.py
===================================================================
--- pro/scripts/utilities/findLibError.py	2010-05-06 07:57:59 UTC (rev 2946)
+++ pro/scripts/utilities/findLibError.py	2010-05-06 08:12:56 UTC (rev 2947)
@@ -48,7 +48,7 @@
 # 05.6_mantisfight, 05.7_cliffside, 05.8_ambushfight, 07.1_volcano, 07.2_intothecave, 08.1_dragonslair, 08.2_thebigfight, 08.4_realization, 09.1_sinkingin
 
 
-search = '/media/data/durian/pro/scenes/04.1_ziggurat'
+search = '/media/data/durian/pro/env_city/'
 
 # blender_bin = '/render/blender_$(whoami)/blender/blender'
 blender_cmd = 'LD_LIBRARY_PATH=/shared/software/exr/lib  /media/data/blender_guest/blender/blender' 

Modified: pro/scripts/utilities/findPathError.py
===================================================================
--- pro/scripts/utilities/findPathError.py	2010-05-06 07:57:59 UTC (rev 2946)
+++ pro/scripts/utilities/findPathError.py	2010-05-06 08:12:56 UTC (rev 2947)
@@ -222,6 +222,16 @@
                 print("ABSOLUTE PATH:", filename, "NOW RELATIVE --> ", i.filename)
                 change = 1
 
+            if 1:
+                filename_abs = expandpath(i.filename)
+
+                # check for BAD rel paths
+                filename_new = relpath(filename_abs)
+                if filename_new != filename:
+                    change = 1
+                    i.filename = filename_new
+                    print("RELATIVE PATH:", filename, "NOW NICER --> ", i.filename)
+
     return change
     
 
@@ -256,8 +266,8 @@
     
     # optional, take care!
     change |= make_relative()
-    change |= clear_images(rem_missing = True)
-    change |= merge_duplicates()
+    #change |= clear_images(rem_missing = True)
+    #change |= merge_duplicates()
     
     print("Changing??? ", change)
     if change: