[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3513] contrib/py/scripts/addons/ oscurart_tools.py: Improves in apply and restore overrides.

[Eugenio Pignataro]

Revision: 3513
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3513
Author:   oscurart
Date:     2012-06-21 00:20:10 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
Improves in apply and restore overrides.

Modified Paths:
--------------
    contrib/py/scripts/addons/oscurart_tools.py

Modified: contrib/py/scripts/addons/oscurart_tools.py
===================================================================
--- contrib/py/scripts/addons/oscurart_tools.py	2012-06-20 16:21:09 UTC (rev 3512)
+++ contrib/py/scripts/addons/oscurart_tools.py	2012-06-21 00:20:10 UTC (rev 3513)
@@ -19,12 +19,12 @@
 bl_info = {
     "name": "Oscurart Tools",
     "author": "Oscurart",
-    "version": (2,9),
+    "version": (3,0),
     "blender": (2, 6, 3),
     "location": "View3D > Tools > Oscurart Tools",
     "description": "Tools for objects, render, shapes, and files.",
     "warning": "",
-    "wiki_url": "oscurart.blogspot.com",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Oscurart_Tools",
     "tracker_url": "",
     "category": "Object"}
 
@@ -2353,23 +2353,20 @@
         ENTFILEPATH= "%s%s%s_OVERRIDE.xml" %  (ACTIVEFOLDER, SYSBAR, bpy.context.scene.name)
         XML=open(ENTFILEPATH ,mode="w")
         ## GUARDO MATERIALES DE OBJETOS EN GRUPOS
-        for OBJECT in bpy.data.objects[:]:
-            SLOTLIST = []
-            try:
-                if OBJECT.type == "MESH" or OBJECT.type == "META" or OBJECT.type == "CURVE":
-                    SLOTLIST = [SLOT.material for SLOT in OBJECT.material_slots[:]]
-                    LISTMAT.append((OBJECT,SLOTLIST))
-            except:
-                pass
-        try:
-            for OVERRIDE in PROPTOLIST:
-                for OBJECT in bpy.data.groups[OVERRIDE[0]].objects[:]:
-                    if OBJECT.type == "MESH" or OBJECT.type == "META" or OBJECT.type == "CURVE":
+
+        LISTMAT = { OBJ : [SLOT.material for SLOT in OBJ.material_slots[:]] for OBJ in bpy.data.objects[:] if OBJ.type == "MESH" or OBJ.type == "META" or OBJ.type == "CURVE" }
+
+
+        for OVERRIDE in PROPTOLIST:
+            for OBJECT in bpy.data.groups[OVERRIDE[0]].objects[:]:
+                if OBJECT.type == "MESH" or OBJECT.type == "META" or OBJECT.type == "CURVE": 
+                    if len(OBJECT.material_slots) > 0:                   
                         for SLOT in OBJECT.material_slots[:]:
-                            SLOT.material = bpy.data.materials[OVERRIDE[1]]
-        except:
-            pass
+                            SLOT.material = bpy.data.materials[OVERRIDE[1]]                    
+                    else:
+                        print ("* %s have not Material Slots" % (OBJECT))         
 
+
         XML.writelines(str(LISTMAT))
         XML.close()
         return {'FINISHED'}
@@ -2395,17 +2392,17 @@
         XML = open(ENTFILEPATH, mode="r")
         RXML = XML.readlines(0)
 
-        LISTMAT = list(eval(RXML[0]))
+        LISTMAT = dict(eval(RXML[0]))
 
         # RESTAURO MATERIALES  DE OVERRIDES
-        for OBJECT in LISTMAT:
-            SLOTIND = 0
-            try:
-                for SLOT in OBJECT[1]:
-                    OBJECT[0].material_slots[SLOTIND].material = SLOT
-                    SLOTIND += 1
-            except:
-                print("OUT OF RANGE")
+        
+        for OBJ in LISTMAT:            
+            if OBJ.type == "MESH" or OBJ.type == "META" or OBJ.type == "CURVE":
+                SLOTIND = 0
+                for SLOT in LISTMAT[OBJ]:
+                    OBJ.material_slots[SLOTIND].material = SLOT  
+                    SLOTIND += 1     
+       
         # CIERRO
         XML.close()