[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31301] trunk/blender/release/scripts/ui: 2.5 User Interface / UI Scripts
Thomas Dinges
dingto at gmx.de
Thu Aug 12 21:36:10 CEST 2010
Revision: 31301
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31301
Author: dingto
Date: 2010-08-12 21:36:10 +0200 (Thu, 12 Aug 2010)
Log Message:
-----------
2.5 User Interface / UI Scripts
* Fixed some panel ordering after recent register changes.
* Placed "Custom Props" to the bottom again, where possible
This fixes [#23171] Material context is messed up.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_data_bone.py
trunk/blender/release/scripts/ui/properties_data_camera.py
trunk/blender/release/scripts/ui/properties_data_curve.py
trunk/blender/release/scripts/ui/properties_data_lamp.py
trunk/blender/release/scripts/ui/properties_data_lattice.py
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/properties_data_metaball.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/properties_world.py
Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -51,11 +51,6 @@
split.separator()
-class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
-
-
class DATA_PT_skeleton(ArmatureButtonsPanel, bpy.types.Panel):
bl_label = "Skeleton"
@@ -285,6 +280,11 @@
self.draw_settings(context, ob.pose.animation_visualisation, bones=True)
+
+class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_bone.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_bone.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -47,18 +47,6 @@
row.prop(bone, "name", text="")
-class BONE_PT_custom_props(BoneButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
- @property
- def _context_path(self):
- obj = bpy.context.object
- if obj and obj.mode == 'POSE':
- return "active_pose_bone"
- else:
- return "active_bone"
-
-
class BONE_PT_transform(BoneButtonsPanel, bpy.types.Panel):
bl_label = "Transform"
@@ -354,6 +342,18 @@
col.prop(bone, "cyclic_offset")
+class BONE_PT_custom_props(BoneButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+
+ @property
+ def _context_path(self):
+ obj = bpy.context.object
+ if obj and obj.mode == 'POSE':
+ return "active_pose_bone"
+ else:
+ return "active_bone"
+
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_camera.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_camera.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_camera.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -53,11 +53,6 @@
split.separator()
-class DATA_PT_custom_props_camera(CameraButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
-
-
class DATA_PT_camera(CameraButtonsPanel, bpy.types.Panel):
bl_label = "Lens"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -137,6 +132,11 @@
sub.prop(cam, "passepartout_alpha", text="Alpha", slider=True)
+class DATA_PT_custom_props_camera(CameraButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_curve.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_curve.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -69,11 +69,6 @@
split.separator()
-class DATA_PT_custom_props_curve(CurveButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
-
-
class DATA_PT_shape_curve(CurveButtonsPanel, bpy.types.Panel):
bl_label = "Shape"
@@ -385,6 +380,11 @@
row.operator("font.textbox_remove", text='', icon='X', emboss=False).index = i
+class DATA_PT_custom_props_curve(CurveButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_lamp.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_lamp.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -40,13 +40,6 @@
return context.lamp and (engine in cls.COMPAT_ENGINES)
-class DATA_PT_preview(DataButtonsPanel, bpy.types.Panel):
- bl_label = "Preview"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
- def draw(self, context):
- self.layout.template_preview(context.lamp)
-
class DATA_PT_context_lamp(DataButtonsPanel, bpy.types.Panel):
bl_label = ""
bl_show_header = False
@@ -69,11 +62,14 @@
split.separator()
-class DATA_PT_custom_props_lamp(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+class DATA_PT_preview(DataButtonsPanel, bpy.types.Panel):
+ bl_label = "Preview"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
+ def draw(self, context):
+ self.layout.template_preview(context.lamp)
+
class DATA_PT_lamp(DataButtonsPanel, bpy.types.Panel):
bl_label = "Lamp"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -387,6 +383,11 @@
self.layout.template_curve_mapping(lamp, "falloff_curve")
+class DATA_PT_custom_props_lamp(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_lattice.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_lattice.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_lattice.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -51,11 +51,6 @@
split.separator()
-class DATA_PT_custom_props_lattice(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
-
-
class DATA_PT_lattice(DataButtonsPanel, bpy.types.Panel):
bl_label = "Lattice"
@@ -85,8 +80,13 @@
row = layout.row()
row.prop(lat, "outside")
row.prop_object(lat, "vertex_group", context.object, "vertex_groups", text="")
+
+class DATA_PT_custom_props_lattice(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_mesh.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_mesh.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -79,11 +79,6 @@
split.separator()
-class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
-
-
class DATA_PT_normals(MeshButtonsPanel, bpy.types.Panel):
bl_label = "Normals"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -351,6 +346,11 @@
layout.prop(lay, "name")
+class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_data_metaball.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_metaball.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_data_metaball.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -51,11 +51,6 @@
split.separator()
-class DATA_PT_custom_props_metaball(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "object.data"
-
-
class DATA_PT_metaball(DataButtonsPanel, bpy.types.Panel):
bl_label = "Metaball"
@@ -120,6 +115,11 @@
col.prop(metaelem, "size_y", text="Y")
+class DATA_PT_custom_props_metaball(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ _context_path = "object.data"
+
+
def register():
pass
Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py 2010-08-12 18:08:22 UTC (rev 31300)
+++ trunk/blender/release/scripts/ui/properties_material.py 2010-08-12 19:36:10 UTC (rev 31301)
@@ -63,14 +63,6 @@
return context.material and (context.scene.render.engine in cls.COMPAT_ENGINES)
-class MATERIAL_PT_preview(MaterialButtonsPanel, bpy.types.Panel):
- bl_label = "Preview"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
- def draw(self, context):
- self.layout.template_preview(context.material)
-
-
class MATERIAL_PT_context_material(MaterialButtonsPanel, bpy.types.Panel):
bl_label = ""
bl_show_header = False
@@ -127,204 +119,16 @@
if mat:
layout.prop(mat, "type", expand=True)
+
-
-class MATERIAL_PT_custom_props(MaterialButtonsPanel, PropertyPanel, bpy.types.Panel):
+class MATERIAL_PT_preview(MaterialButtonsPanel, bpy.types.Panel):
+ bl_label = "Preview"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- _context_path = "material"
-
-class MATERIAL_PT_shading(MaterialButtonsPanel, bpy.types.Panel):
- bl_label = "Shading"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
- @classmethod
- def poll(cls, context):
- mat = active_node_mat(context.material)
- engine = context.scene.render.engine
- return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in cls.COMPAT_ENGINES)
-
def draw(self, context):
- layout = self.layout
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list