[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53362] trunk/blender/release/scripts/ startup/bl_ui: remove type checks on drawing uiList's,

Campbell Barton ideasman42 at gmail.com
Fri Dec 28 11:45:59 CET 2012


Revision: 53362
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53362
Author:   campbellbarton
Date:     2012-12-28 10:45:59 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
remove type checks on drawing uiList's,

if the list is given the wrong item then the script needs to be fixed, better not fail silently.

left in checks as commented out asserts.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py
    trunk/blender/release/scripts/startup/bl_ui/properties_material.py
    trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    trunk/blender/release/scripts/startup/bl_ui/properties_render.py
    trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
    trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
    trunk/blender/release/scripts/startup/bl_ui/space_clip.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -56,8 +56,7 @@
 
 class MESH_UL_vgroups(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.VertexGroup):
-            return
+        # assert(isinstance(item, bpy.types.VertexGroup)
         vgroup = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.label(vgroup.name, icon_value=icon)
@@ -70,8 +69,7 @@
 
 class MESH_UL_shape_keys(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.ShapeKey):
-            return
+        # assert(isinstance(item, bpy.types.ShapeKey)
         obj = active_data
         key = data
         key_block = item
@@ -93,9 +91,7 @@
 
 class MESH_UL_uvmaps_vcols(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer)):
-            print(item.__class__)
-            return
+        # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer))
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.label(item.name, icon_value=icon)
             icon = 'RESTRICT_RENDER_OFF' if item.active_render else 'RESTRICT_RENDER_ON'

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -27,8 +27,7 @@
 
 class MASK_UL_layers(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.MaskLayer):
-            return
+        # assert(isinstance(item, bpy.types.MaskLayer)
         mask = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             split = layout.split()

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_material.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_material.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -71,8 +71,7 @@
 
 class MATERIAL_UL_matslots(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.MaterialSlot):
-            return
+        # assert(isinstance(item, bpy.types.MaterialSlot)
         ob = data
         slot = item
         ma = slot.material

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -27,8 +27,7 @@
 
 class PHYSICS_UL_dynapaint_surfaces(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.DynamicPaintSurface):
-            return
+        # assert(isinstance(item, bpy.types.DynamicPaintSurface)
         surf = item
         sticon = layout.enum_item_icon(surf, "surface_type", surf.surface_type)
         if self.layout_type in {'DEFAULT', 'COMPACT'}:

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -45,8 +45,7 @@
 
 class RENDER_UL_renderlayers(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.SceneRenderLayer):
-            return
+        # assert(isinstance(item, bpy.types.SceneRenderLayer)
         layer = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.label(layer.name, icon_value=icon)

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -24,8 +24,7 @@
 
 class SCENE_UL_keying_set_paths(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not isinstance(item, bpy.types.KeyingSetPath):
-            return
+        # assert(isinstance(item, bpy.types.KeyingSetPath)
         kspath = item
         icon = layout.enum_item_icon(kspath, "id_type", kspath.id_type)
         if self.layout_type in {'DEFAULT', 'COMPACT'}:

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -58,8 +58,7 @@
 
 class TEXTURE_UL_texslots(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not (item is None or isinstance(item, bpy.types.MaterialTextureSlot)):
-            return
+        # assert(isinstance(item, bpy.types.MaterialTextureSlot)
         ma = data
         slot = item
         tex = slot.texture if slot else None

Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2012-12-28 10:38:07 UTC (rev 53361)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2012-12-28 10:45:59 UTC (rev 53362)
@@ -24,8 +24,7 @@
 
 class CLIP_UL_tracking_objects(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        if not (item is None or isinstance(item, bpy.types.MovieTrackingObject)):
-            return
+        # assert(isinstance(item, bpy.types.MovieTrackingObject)
         tobj = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.label(tobj.name, icon='CAMERA_DATA' if tobj.is_camera else 'OBJECT_DATA')




More information about the Bf-blender-cvs mailing list