From 8a1e41ca7d5b59f12711e19d2382c4f4448f7803 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Mon, 18 Feb 2013 13:31:50 +0000
Subject: [PATCH] Systematically adding some custom id to template_list using
default UI_UL_list class, this one is commoly used more than once in an area,
yielding collision issues if they do not have a custom id...
---
io_export_unreal_psk_psa.py | 9 ++++++---
io_import_scene_unreal_psa_psk.py | 2 +-
modules/extensions_framework/ui.py | 2 +-
netrender/ui.py | 7 ++++---
render_renderfarmfi/panels.py | 2 +-
texture_paint_layer_manager.py | 2 +-
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index 909f246a7..c84efd371 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -2325,14 +2325,17 @@ class Panel_UDKExport( bpy.types.Panel ):
if context.scene.udk_option_selectobjects:
layout.operator("object.selobjectpdate")
layout.label(text="ARMATURE")
- layout.template_list("UI_UL_list", "", context.scene, "udkArm_list", context.scene, "udkArm_list_idx", rows=3)
+ layout.template_list("UI_UL_list", "udk_armatures", context.scene, "udkArm_list",
+ context.scene, "udkArm_list_idx", rows=3)
layout.label(text="MESH - Select / Export")
- layout.template_list("UL_UDKMeshList", "", context.scene, "udkmesh_list", context.scene, "udkmesh_list_idx", rows=5)
+ layout.template_list("UL_UDKMeshList", "", context.scene, "udkmesh_list",
+ context.scene, "udkmesh_list_idx", rows=5)
layout.prop(context.scene, "udk_option_selectanimations")
if context.scene.udk_option_selectanimations:
layout.operator("action.setanimupdate")
layout.label(text="Action Set(s) - Match / Export")
- layout.template_list("UL_UDKActionSetList", "", context.scene, "udkas_list", context.scene, "udkas_list_idx", rows=5)
+ layout.template_list("UL_UDKActionSetList", "", context.scene, "udkas_list",
+ context.scene, "udkas_list_idx", rows=5)
test = layout.separator()
layout.prop(context.scene, "udk_option_scale")
layout.prop(context.scene, "udk_option_rebuildobjects")
diff --git a/io_import_scene_unreal_psa_psk.py b/io_import_scene_unreal_psa_psk.py
index 6825511d1..64f0e6d0d 100644
--- a/io_import_scene_unreal_psa_psk.py
+++ b/io_import_scene_unreal_psa_psk.py
@@ -1120,7 +1120,7 @@ class Panel_UDKImport(bpy.types.Panel):
layout.prop(context.scene, "udk_importarmatureselect")
if bpy.context.scene.udk_importarmatureselect:
layout.operator(OBJECT_OT_UDKImportArmature.bl_idname)
- layout.template_list("UI_UL_list", "", context.scene, "udkimportarmature_list",
+ layout.template_list("UI_UL_list", "udkimportarmature_list", context.scene, "udkimportarmature_list",
context.scene, "udkimportarmature_list_idx", rows=5)
layout.operator(OBJECT_OT_PSAPath.bl_idname)
diff --git a/modules/extensions_framework/ui.py b/modules/extensions_framework/ui.py
index 2533a6697..043b807b2 100644
--- a/modules/extensions_framework/ui.py
+++ b/modules/extensions_framework/ui.py
@@ -295,7 +295,7 @@ class property_group_renderer(bpy.types.Panel):
)
elif current_property['type'] in ['template_list']:
- layout.template_list("UI_UL_list", "",
+ layout.template_list("UI_UL_list", current_property['src_attr'], # Use that as uid...
current_property['src'](supercontext, context),
current_property['src_attr'],
current_property['trg'](supercontext, context),
diff --git a/netrender/ui.py b/netrender/ui.py
index 9d032cf53..2b352a5e4 100644
--- a/netrender/ui.py
+++ b/netrender/ui.py
@@ -276,7 +276,8 @@ class RENDER_PT_network_slaves(NeedValidAddress, NetRenderButtonsPanel, bpy.type
netsettings = context.scene.network_render
row = layout.row()
- row.template_list("UI_UL_list", "", netsettings, "slaves", netsettings, "active_slave_index", rows=2)
+ row.template_list("UI_UL_list", "net_render_slaves", netsettings, "slaves",
+ netsettings, "active_slave_index", rows=2)
sub = row.column(align=True)
sub.operator("render.netclientslaves", icon='FILE_REFRESH', text="")
@@ -307,7 +308,7 @@ class RENDER_PT_network_slaves_blacklist(NeedValidAddress, NetRenderButtonsPanel
netsettings = context.scene.network_render
row = layout.row()
- row.template_list("UI_UL_list", "", netsettings, "slaves_blacklist",
+ row.template_list("UI_UL_list", "net_render_slaves_blacklist", netsettings, "slaves_blacklist",
netsettings, "active_blacklisted_slave_index", rows=2)
sub = row.column(align=True)
@@ -338,7 +339,7 @@ class RENDER_PT_network_jobs(NeedValidAddress, NetRenderButtonsPanel, bpy.types.
netsettings = context.scene.network_render
row = layout.row()
- row.template_list("UI_UL_list", "", netsettings, "jobs", netsettings, "active_job_index", rows=2)
+ row.template_list("UI_UL_list", "net_render", netsettings, "jobs", netsettings, "active_job_index", rows=2)
sub = row.column(align=True)
sub.operator("render.netclientstatus", icon='FILE_REFRESH', text="")
diff --git a/render_renderfarmfi/panels.py b/render_renderfarmfi/panels.py
index b202a5820..4c011a457 100644
--- a/render_renderfarmfi/panels.py
+++ b/render_renderfarmfi/panels.py
@@ -101,7 +101,7 @@ class SESSIONS_PT_RenderfarmFi(RenderButtonsPanel, bpy.types.Panel):
if (bpy.passwordCorrect == True and bpy.loginInserted == True):
layout = self.layout
- layout.template_list("UI_UL_list", "", ore, 'all_sessions', ore, 'selected_session', rows=5)
+ layout.template_list("UI_UL_list", "rederfarmfi_render", ore, 'all_sessions', ore, 'selected_session', rows=5)
layout.operator('ore.cancel_session')
if (bpy.cancelError == True):
layout.label("This session cannot be cancelled")
diff --git a/texture_paint_layer_manager.py b/texture_paint_layer_manager.py
index 192f9e66e..dd8c3a054 100644
--- a/texture_paint_layer_manager.py
+++ b/texture_paint_layer_manager.py
@@ -155,7 +155,7 @@ class OBJECT_PT_Texture_paint_layers(bpy.types.Panel):
row.label(' Add a Material first!', icon = 'ERROR')
else:
row = layout.row()
- row.template_list("UI_UL_list", "", ob, "material_slots", ob,
+ row.template_list("UI_UL_list", "texture_paint_layers", ob, "material_slots", ob,
"active_material_index", rows=2 )
#list Paintable textures
--
GitLab