Revision: 21459
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21459
Author: campbellbarton
Date: 2009-07-09 11:42:34 +0200 (Thu, 09 Jul 2009)
Log Message:
-----------
patch from William, panel names need to be unique
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_armature.py
branches/blender2.5/blender/release/ui/buttons_data_bone.py
branches/blender2.5/blender/release/ui/buttons_data_camera.py
branches/blender2.5/blender/release/ui/buttons_data_curve.py
branches/blender2.5/blender/release/ui/buttons_data_lamp.py
branches/blender2.5/blender/release/ui/buttons_data_lattice.py
branches/blender2.5/blender/release/ui/buttons_data_mesh.py
branches/blender2.5/blender/release/ui/buttons_data_text.py
branches/blender2.5/blender/release/ui/buttons_material.py
branches/blender2.5/blender/release/ui/buttons_objects.py
branches/blender2.5/blender/release/ui/buttons_texture.py
branches/blender2.5/blender/release/ui/buttons_world.py
Modified: branches/blender2.5/blender/release/ui/buttons_data_armature.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_armature.py
2009-07-09 09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_armature.py
2009-07-09 09:42:34 UTC (rev 21459)
@@ -9,8 +9,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_bone.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_bone.py 2009-07-09
09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_bone.py 2009-07-09
09:42:34 UTC (rev 21459)
@@ -9,8 +9,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_camera.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_camera.py
2009-07-09 09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_camera.py
2009-07-09 09:42:34 UTC (rev 21459)
@@ -9,8 +9,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_curve.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_curve.py
2009-07-09 09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_curve.py
2009-07-09 09:42:34 UTC (rev 21459)
@@ -10,8 +10,8 @@
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 @@
# 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 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-07-09
09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-07-09
09:42:34 UTC (rev 21459)
@@ -19,8 +19,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_lattice.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lattice.py
2009-07-09 09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_lattice.py
2009-07-09 09:42:34 UTC (rev 21459)
@@ -9,8 +9,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_mesh.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_mesh.py 2009-07-09
09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_mesh.py 2009-07-09
09:42:34 UTC (rev 21459)
@@ -10,8 +10,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_data_text.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_text.py 2009-07-09
09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_data_text.py 2009-07-09
09:42:34 UTC (rev 21459)
@@ -9,8 +9,8 @@
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 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py 2009-07-09
09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_material.py 2009-07-09
09:42:34 UTC (rev 21459)
@@ -22,8 +22,8 @@
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 @@
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)
Modified: branches/blender2.5/blender/release/ui/buttons_objects.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_objects.py 2009-07-09
09:07:25 UTC (rev 21458)
+++ branches/blender2.5/blender/release/ui/buttons_objects.py 2009-07-09
09:42:34 UTC (rev 21459)
@@ -6,8 +6,8 @@
__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 @@
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)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
