patch from William, panel names need to be unique

diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py
index 98002f69ccb1c86f8b56a0b70e925f7acdc049ac..7db2419fa9cb4674af249ba8cc4277a43b08d263 100644 (file)
--- a/release/ui/buttons_data_armature.py
+++ b/release/ui/buttons_data_armature.py
@@ -9,8 +9,8 @@ class DataButtonsPanel(bpy.types.Panel):
        def poll(self, context):
                return (context.armature != None)
 
-class DATA_PT_contextarm(DataButtonsPanel):
-       __idname__ = "DATA_PT_contextarm"
+class DATA_PT_context_arm(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_arm"
        __label__ = " "
        
        def poll(self, context):
@@ -138,7 +138,7 @@ class DATA_PT_ghost(DataButtonsPanel):
                sub = split.column()
                sub.itemR(arm, "ghost_only_selected", text="Selected Only")
 
-bpy.types.register(DATA_PT_contextarm)
+bpy.types.register(DATA_PT_context_arm)
 bpy.types.register(DATA_PT_skeleton)
 bpy.types.register(DATA_PT_display)
 bpy.types.register(DATA_PT_paths)

diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py
index 397a5eb0cd4f43180bc132e7069515ecdc85b723..b9130be936782477d382122c6bfddcc9666f5180 100644 (file)
--- a/release/ui/buttons_data_bone.py
+++ b/release/ui/buttons_data_bone.py
@@ -9,8 +9,8 @@ class BoneButtonsPanel(bpy.types.Panel):
        def poll(self, context):
                return (context.bone or context.edit_bone)
 
-class BONE_PT_context(BoneButtonsPanel):
-       __idname__ = "BONE_PT_context"
+class BONE_PT_context_bone(BoneButtonsPanel):
+       __idname__ = "BONE_PT_context_bone"
        __label__ = " "
 
        def draw(self, context):
@@ -92,6 +92,6 @@ class BONE_PT_deform(BoneButtonsPanel):
                sub.itemR(bone, "cyclic_offset")
 
 
-bpy.types.register(BONE_PT_context)
+bpy.types.register(BONE_PT_context_bone)
 bpy.types.register(BONE_PT_bone)
 bpy.types.register(BONE_PT_deform)

diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py
index 2092a34f9e8f6dc4656a2ceb1b75efe4b299c0ee..197f45f1a0c1270a9f14118074ab80eff4e4f493 100644 (file)
--- a/release/ui/buttons_data_camera.py
+++ b/release/ui/buttons_data_camera.py
@@ -9,8 +9,8 @@ class DataButtonsPanel(bpy.types.Panel):
        def poll(self, context):
                return (context.camera != None)
                
-class DATA_PT_context(DataButtonsPanel):
-       __idname__ = "DATA_PT_context"
+class DATA_PT_context_camera(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_camera"
        __label__ = " "
        
        def poll(self, context):
@@ -101,6 +101,6 @@ class DATA_PT_camera_display(DataButtonsPanel):
                colsub.itemR(cam, "passepartout_alpha", text="Alpha", slider=True)
                col.itemR(cam, "draw_size", text="Size")
                
-bpy.types.register(DATA_PT_context)
+bpy.types.register(DATA_PT_context_camera)
 bpy.types.register(DATA_PT_camera)
 bpy.types.register(DATA_PT_camera_display)

diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py
index cc671871d1dc0d0d328bc514d45b4e0f39d148ce..6e46bf61f534afa8df174dbaec6a463926c6c00e 100644 (file)
--- a/release/ui/buttons_data_curve.py
+++ b/release/ui/buttons_data_curve.py
@@ -10,8 +10,8 @@ class DataButtonsPanel(bpy.types.Panel):
                return (context.object and context.object.type == 'CURVE' and context.curve)
 
 
-class DATA_PT_context(DataButtonsPanel):
-       __idname__ = "DATA_PT_context"
+class DATA_PT_context_curve(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_curve"
        __label__ = " "
        
        def poll(self, context):
@@ -78,9 +78,9 @@ class DATA_PT_shape_curve(DataButtonsPanel):
 #                      sub.itemL(text="NORMALS")
 #                      sub.itemR(curve, "vertex_normal_flip")
 
-class DATA_PT_geometry(DataButtonsPanel):
-       __idname__ = "DATA_PT_geometry"
-       __label__ = "Geometry"
+class DATA_PT_geometry_curve(DataButtonsPanel):
+       __idname__ = "DATA_PT_geometry_curve"
+       __label__ = "Geometry "
 
        def draw(self, context):
                layout = self.layout
@@ -92,13 +92,13 @@ class DATA_PT_geometry(DataButtonsPanel):
                sub.itemL(text="Modification:")
                sub.itemR(curve, "width")
                sub.itemR(curve, "extrude")
-               sub.itemR(curve, "taper_object")
+               sub.itemR(curve, "taper_object", icon="ICON_OUTLINER_OB_CURVE")
                
                sub = split.column()
                sub.itemL(text="Bevel:")
                sub.itemR(curve, "bevel_depth", text="Depth")
                sub.itemR(curve, "bevel_resolution", text="Resolution")
-               sub.itemR(curve, "bevel_object")
+               sub.itemR(curve, "bevel_object", icon="ICON_OUTLINER_OB_CURVE")
        
 class DATA_PT_pathanim(DataButtonsPanel):
        __idname__ = "DATA_PT_pathanim"
@@ -158,8 +158,8 @@ class DATA_PT_current_curve(DataButtonsPanel):
                sub.itemR(currentcurve, "radius_interpolation", text="Tilt")
                sub.itemR(currentcurve, "smooth")
                
-bpy.types.register(DATA_PT_context)
+bpy.types.register(DATA_PT_context_curve)
 bpy.types.register(DATA_PT_shape_curve)
-bpy.types.register(DATA_PT_geometry)
+bpy.types.register(DATA_PT_geometry_curve)
 bpy.types.register(DATA_PT_pathanim)
 bpy.types.register(DATA_PT_current_curve)

diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py
index 815821c6895af7acac23d669c6a4685ea7f63259..00d54aa5b70778f6aa4d0a3a7972ee9645e61a83 100644 (file)
--- a/release/ui/buttons_data_lamp.py
+++ b/release/ui/buttons_data_lamp.py
@@ -19,8 +19,8 @@ class DATA_PT_preview(DataButtonsPanel):
                lamp = context.lamp
                layout.template_preview(lamp)
        
-class DATA_PT_context(DataButtonsPanel):
-       __idname__ = "DATA_PT_context"
+class DATA_PT_context_lamp(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_lamp"
        __label__ = " "
        
        def poll(self, context):
@@ -257,7 +257,7 @@ class DATA_PT_falloff_curve(DataButtonsPanel):
 
                layout.template_curve_mapping(lamp.falloff_curve)
 
-bpy.types.register(DATA_PT_context)
+bpy.types.register(DATA_PT_context_lamp)
 bpy.types.register(DATA_PT_preview)
 bpy.types.register(DATA_PT_lamp)
 bpy.types.register(DATA_PT_shadow)

diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py
index e6194f4fcb4af4a6a4b21da3aced001a82ea1977..6636cbf533defa790d17d8a178934ba104f1ef08 100644 (file)
--- a/release/ui/buttons_data_lattice.py
+++ b/release/ui/buttons_data_lattice.py
@@ -9,8 +9,8 @@ class DataButtonsPanel(bpy.types.Panel):
        def poll(self, context):
                return (context.lattice != None)
        
-class DATA_PT_context(DataButtonsPanel):
-       __idname__ = "DATA_PT_context"
+class DATA_PT_context_lattice(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_lattice"
        __label__ = " "
        
        def poll(self, context):
@@ -64,5 +64,5 @@ class DATA_PT_lattice(DataButtonsPanel):
                        row.itemO("LATTICE_OT_make_regular")
                        row.itemR(lat, "outside")
 
-bpy.types.register(DATA_PT_context)
+bpy.types.register(DATA_PT_context_lattice)
 bpy.types.register(DATA_PT_lattice)

diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index 5e7c34d56a9c76977eb4ee4b8f4a75602f936cd0..1f9b958aabbf00d3d957f13b9c1188731f650619 100644 (file)
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -10,8 +10,8 @@ class DataButtonsPanel(bpy.types.Panel):
                return (context.mesh != None)
 
 
-class DATA_PT_context2(DataButtonsPanel):
-       __idname__ = "DATA_PT_context2"
+class DATA_PT_context_mesh(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_mesh"
        __label__ = " "
        
        def poll(self, context):
@@ -222,7 +222,7 @@ class DATA_PT_vertex_colors(DataButtonsPanel):
                col.itemO("MESH_OT_vertex_color_add", icon="ICON_ZOOMIN", text="")
                col.itemO("MESH_OT_vertex_color_remove", icon="ICON_ZOOMOUT", text="")
 
-bpy.types.register(DATA_PT_context2)
+bpy.types.register(DATA_PT_context_mesh)
 bpy.types.register(DATA_PT_mesh)
 bpy.types.register(DATA_PT_materials)
 bpy.types.register(DATA_PT_vertex_groups)

diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py
index e2113a346da7fa3618c240f1d8c6d7513144d525..ee8b0dbd56810d77d5e412463ba962b6bf4ac3ba 100644 (file)
--- a/release/ui/buttons_data_text.py
+++ b/release/ui/buttons_data_text.py
@@ -9,8 +9,8 @@ class DataButtonsPanel(bpy.types.Panel):
        def poll(self, context):
                return (context.object and context.object.type == 'TEXT' and context.curve)
                
-class DATA_PT_context(DataButtonsPanel):
-       __idname__ = "DATA_PT_context"
+class DATA_PT_context_text(DataButtonsPanel):
+       __idname__ = "DATA_PT_context_text"
        __label__ = " "
        
        def poll(self, context):
@@ -73,8 +73,8 @@ class DATA_PT_shape_text(DataButtonsPanel):
                        sub.itemL(text="Display:")
                        sub.itemR(curve, "fast")
 
-class DATA_PT_geometry(DataButtonsPanel):
-       __idname__ = "DATA_PT_geometry"
+class DATA_PT_geometry_text(DataButtonsPanel):
+       __idname__ = "DATA_PT_geometry_text"
        __label__ = "Geometry"
 
        def draw(self, context):
@@ -161,9 +161,9 @@ class DATA_PT_textboxes(DataButtonsPanel):
                        text = context.curve
 """
 
-bpy.types.register(DATA_PT_context)    
+bpy.types.register(DATA_PT_context_text)       
 bpy.types.register(DATA_PT_shape_text) 
-bpy.types.register(DATA_PT_geometry)
+bpy.types.register(DATA_PT_geometry_text)
 bpy.types.register(DATA_PT_font)
 bpy.types.register(DATA_PT_paragraph)
 #bpy.types.register(DATA_PT_textboxes)

diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py
index fb7f86c514bc633eb4e58cd805b1c278ea569bea..6cb3da470b65726a13e2b6a9d6e227ad2f00082f 100644 (file)
--- a/release/ui/buttons_material.py
+++ b/release/ui/buttons_material.py
@@ -22,8 +22,8 @@ class MATERIAL_PT_preview(MaterialButtonsPanel):
                
                layout.template_preview(mat)
                
-class MATERIAL_PT_context(MaterialButtonsPanel):
-       __idname__= "MATERIAL_PT_context"
+class MATERIAL_PT_context_material(MaterialButtonsPanel):
+       __idname__= "MATERIAL_PT_context_material"
        __label__ = " "
 
        def poll(self, context):
@@ -436,7 +436,7 @@ class MATERIAL_PT_halo(MaterialButtonsPanel):
                colsub.itemR(halo, "flares_sub", text="Sub")
 
 
-bpy.types.register(MATERIAL_PT_context)
+bpy.types.register(MATERIAL_PT_context_material)
 bpy.types.register(MATERIAL_PT_preview)
 bpy.types.register(MATERIAL_PT_material)
 bpy.types.register(MATERIAL_PT_diffuse)

diff --git a/release/ui/buttons_objects.py b/release/ui/buttons_objects.py
index 4e3ab2672dcd19de2ae7a2c8a6f448739d91fc89..15fe0378dfd0909524e5663857e93e4c65d5f234 100644 (file)
--- a/release/ui/buttons_objects.py
+++ b/release/ui/buttons_objects.py
@@ -6,8 +6,8 @@ class ObjectButtonsPanel(bpy.types.Panel):
        __region_type__ = "WINDOW"
        __context__ = "object"
 
-class OBJECT_PT_context(ObjectButtonsPanel):
-       __idname__ = "OBJECT_PT_context"
+class OBJECT_PT_context_object(ObjectButtonsPanel):
+       __idname__ = "OBJECT_PT_context_object"
        __label__ = " "
 
        def draw(self, context):
@@ -138,7 +138,7 @@ class OBJECT_PT_animation(ObjectButtonsPanel):
                sub.itemR(ob, "up_axis", text="Up Axis")
                sub.itemR(ob, "track_rotation", text="Rotation")
 
-bpy.types.register(OBJECT_PT_context)
+bpy.types.register(OBJECT_PT_context_object)
 bpy.types.register(OBJECT_PT_transform)
 bpy.types.register(OBJECT_PT_groups)
 bpy.types.register(OBJECT_PT_display)

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index 4771a550555796cc47b90a611a2cf4352aaac12a..4d2db7d36a32de8b32a473b0238425065f1b9eda 100644 (file)
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -22,8 +22,8 @@ class TEXTURE_PT_preview(TextureButtonsPanel):
                
                layout.template_preview(tex)
 
-class TEXTURE_PT_context(TextureButtonsPanel):
-       __idname__= "TEXTURE_PT_context"
+class TEXTURE_PT_context_texture(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_context_texture"
        __label__ = " "
 
        def poll(self, context):
@@ -539,7 +539,7 @@ class TEXTURE_PT_distortednoise(TextureButtonsPanel):
                sub = split.column()
                sub.itemR(tex, "nabla") 
 
-bpy.types.register(TEXTURE_PT_context)
+bpy.types.register(TEXTURE_PT_context_texture)
 bpy.types.register(TEXTURE_PT_preview)
 bpy.types.register(TEXTURE_PT_texture)
 bpy.types.register(TEXTURE_PT_clouds)

diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py
index cfee92dff0b476db7347142968490e2faa357f72..266e417e49242e704c640a6275915a88cd2b1ed6 100644 (file)
--- a/release/ui/buttons_world.py
+++ b/release/ui/buttons_world.py
@@ -21,7 +21,7 @@ class WORLD_PT_preview(WorldButtonsPanel):
                
                layout.template_preview(world)
        
-class WORLD_PT_context(WorldButtonsPanel):
+class WORLD_PT_context_world(WorldButtonsPanel):
        __label__ = " "
 
        def poll(self, context):
@@ -186,7 +186,7 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel):
                col.row().itemR(ao, "color", expand=True)
                col.itemR(ao, "energy")
 
-bpy.types.register(WORLD_PT_context)   
+bpy.types.register(WORLD_PT_context_world)     
 bpy.types.register(WORLD_PT_preview)
 bpy.types.register(WORLD_PT_world)
 bpy.types.register(WORLD_PT_ambient_occlusion)