[Durian-svn] [2304] Fixed a bunch of broken things, making sure it's in svn

[dolf]

Revision: 2304
          https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=2304
Author:   dolf
Date:     2010-04-21 21:20:46 +0200 (Wed, 21 Apr 2010)
Log Message:
-----------
Fixed a bunch of broken things, making sure it's in svn

Modified Paths:
--------------
    pro/chars/4x_guardian_model_faces.blend
    pro/chars/bd_sintel_model.blend
    pro/chars/chicken.blend
    pro/chars/dragon_adult_model.blend
    pro/chars/dragon_baby.blend
    pro/chars/dragon_baby_model.blend
    pro/chars/guardian_dark.blend
    pro/chars/guardian_dark_model.blend
    pro/chars/guardian_jack.blend
    pro/chars/guardian_jack_model.blend
    pro/chars/guardian_jack_model_faces.blend
    pro/chars/guardian_lao_tseu.blend
    pro/chars/guardian_lao_tseu_model.blend
    pro/chars/guardian_smith.blend
    pro/chars/guardian_smith_model.blend
    pro/chars/ishtarian_manC.blend
    pro/chars/shaman.blend
    pro/chars/sintel_facialshapes.blend
    pro/chars/sintel_model.blend
    pro/chars/sintel_model_old.blend
    pro/chars/sintel_scale_dummy.blend
    pro/chars/sintel_skin_texture.blend
    pro/chars/tanner.blend
    pro/scenes/05.8_ambushfight/05.8i_comp.blend
    pro/scripts/utilities/findPathError.py

Modified: pro/chars/4x_guardian_model_faces.blend
===================================================================
(Binary files differ)

Modified: pro/chars/bd_sintel_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/chicken.blend
===================================================================
(Binary files differ)

Modified: pro/chars/dragon_adult_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/dragon_baby.blend
===================================================================
(Binary files differ)

Modified: pro/chars/dragon_baby_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_dark.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_dark_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_jack.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_jack_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_jack_model_faces.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_lao_tseu.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_lao_tseu_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_smith.blend
===================================================================
(Binary files differ)

Modified: pro/chars/guardian_smith_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/ishtarian_manC.blend
===================================================================
(Binary files differ)

Modified: pro/chars/shaman.blend
===================================================================
(Binary files differ)

Modified: pro/chars/sintel_facialshapes.blend
===================================================================
(Binary files differ)

Modified: pro/chars/sintel_model.blend
===================================================================
(Binary files differ)

Modified: pro/chars/sintel_model_old.blend
===================================================================
(Binary files differ)

Modified: pro/chars/sintel_scale_dummy.blend
===================================================================
(Binary files differ)

Modified: pro/chars/sintel_skin_texture.blend
===================================================================
(Binary files differ)

Modified: pro/chars/tanner.blend
===================================================================
(Binary files differ)

Modified: pro/scenes/05.8_ambushfight/05.8i_comp.blend
===================================================================
(Binary files differ)

Modified: pro/scripts/utilities/findPathError.py
===================================================================
--- pro/scripts/utilities/findPathError.py	2010-04-21 19:18:53 UTC (rev 2303)
+++ pro/scripts/utilities/findPathError.py	2010-04-21 19:20:46 UTC (rev 2304)
@@ -99,6 +99,8 @@
 
 
 def report_images():
+    
+    missing_images = []
 
     for i in bpy.data.images:
         if not i.library:
@@ -114,6 +116,7 @@
                 filename_abs = expandpath(filename)
             
             if not exists(filename_abs):
+                missing_images.append(i)
                 print("ERROR PATH:", name, filename, 'ABS:', filename_abs)
             
             if i.packed_file:
@@ -125,6 +128,8 @@
         value = image_dupes[filename_abs]
         if len(value) > 1:
             print("DUPLICATE PATH:", filename_abs, 'Datablocks:', ' '.join([i.name for i in value]))
+    
+    return missing_images()
 
 
 def report_modifiers():
@@ -182,29 +187,34 @@
                 change = 1
 
     return change
+    
 
-def clear_images():
+def clear_images(missing_images):
     change = 0
     for i in bpy.data.images:
         if not i.library:
             if ignore_image(i):
                 continue
             
-            if "Weeklies" in i.filename:
+            #for bad in "Weeklies", "Ben_Desktop", "/shared/", "/home/soenke/Desktop/", "/home/guest/":
+            #if bad in i.filename:
+            if i in missing_images:
                 print("ERROR PATH:",  i.name, i.filename, "(REMOVED)")
                 i.user_clear()
                 change = 1
+                break
 
+
     return change
 
 if __name__ == "__main__":
     change = 0
-    report_images()
+    missing_images = report_images()
     report_modifiers()
     
     # optional, take care!
     change |= make_relative()
-    change |= clear_images()
+    change |= clear_images(missing_images)
     change |= merge_duplicates()
     
     print("Changing??? ", change)