[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21095] branches/blender2.5/blender: UI: some API functions don't require explicit context passing anymore.

Brecht Van Lommel brecht at blender.org
Tue Jun 23 02:19:12 CEST 2009


Revision: 21095
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21095
Author:   blendix
Date:     2009-06-23 02:19:10 +0200 (Tue, 23 Jun 2009)

Log Message:
-----------
UI: some API functions don't require explicit context passing anymore.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_armature.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_particle.py
    branches/blender2.5/blender/release/ui/buttons_texture.py
    branches/blender2.5/blender/release/ui/buttons_world.py
    branches/blender2.5/blender/release/ui/space_buttons.py
    branches/blender2.5/blender/release/ui/space_image.py
    branches/blender2.5/blender/release/ui/space_outliner.py
    branches/blender2.5/blender/release/ui/space_sequencer.py
    branches/blender2.5/blender/release/ui/space_text.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_ui_api.c

Modified: branches/blender2.5/blender/release/ui/buttons_data_armature.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_armature.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_armature.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -26,10 +26,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif arm:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if arm:

Modified: branches/blender2.5/blender/release/ui/buttons_data_camera.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_camera.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_camera.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -26,10 +26,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif arm:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if cam:

Modified: branches/blender2.5/blender/release/ui/buttons_data_curve.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_curve.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_curve.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -26,10 +26,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif curve:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if curve:

Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -36,10 +36,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif lamp:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		layout.itemS()

Modified: branches/blender2.5/blender/release/ui/buttons_data_lattice.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lattice.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_lattice.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -26,10 +26,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif lat:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if lat:

Modified: branches/blender2.5/blender/release/ui/buttons_data_mesh.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_mesh.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_mesh.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -26,10 +26,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif mesh:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if mesh:

Modified: branches/blender2.5/blender/release/ui/buttons_data_text.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_text.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_data_text.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -27,10 +27,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob:
-			split.template_ID(context, ob, "data")
+			split.template_ID(ob, "data")
 			split.itemS()
 		elif curve:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if curve:

Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_material.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -40,10 +40,10 @@
 		split = layout.split(percentage=0.65)
 
 		if ob and slot:
-			split.template_ID(context, slot, "material", new="MATERIAL_OT_new")
+			split.template_ID(slot, "material", new="MATERIAL_OT_new")
 			split.itemR(ob, "active_material_index", text="Active")
 		elif mat:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		if mat:

Modified: branches/blender2.5/blender/release/ui/buttons_particle.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_particle.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_particle.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -32,7 +32,7 @@
 		split = layout.split(percentage=0.65)
 
 		if psys:
-			split.template_ID(context, psys, "settings")
+			split.template_ID(psys, "settings")
 
 		if psys:
 			#row = layout.row()

Modified: branches/blender2.5/blender/release/ui/buttons_texture.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_texture.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_texture.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -43,7 +43,7 @@
 
 		if ma or la or wo:
 			if slot:
-				split.template_ID(context, slot, "texture", new="TEXTURE_OT_new")
+				split.template_ID(slot, "texture", new="TEXTURE_OT_new")
 			else:
 				split.itemS()
 
@@ -54,7 +54,7 @@
 			elif wo:
 				split.itemR(wo, "active_texture_index", text="Active")
 		elif tex:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 			split.itemS()
 
 		layout.itemS()

Modified: branches/blender2.5/blender/release/ui/buttons_world.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_world.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/buttons_world.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -37,9 +37,9 @@
 		split = layout.split(percentage=0.65)
 
 		if scene:
-			split.template_ID(context, scene, "world", new="WORLD_OT_new")
+			split.template_ID(scene, "world", new="WORLD_OT_new")
 		elif world:
-			split.template_ID(context, space, "pin_id")
+			split.template_ID(space, "pin_id")
 
 		split.itemS()
 

Modified: branches/blender2.5/blender/release/ui/space_buttons.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_buttons.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/space_buttons.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -15,7 +15,7 @@
 
 		if context.area.show_menus:
 			row = layout.row(align=True)
-			row.itemM(context, "Buttons_MT_view", text="View")
+			row.itemM("Buttons_MT_view", text="View")
 			
 		row = layout.row()
 		row.itemR(so, "buttons_context", expand=True, text="")
@@ -33,4 +33,4 @@
 		col.itemR(so, "panel_alignment", expand=True)
 
 bpy.types.register(Buttons_HT_header)
-bpy.types.register(Buttons_MT_view)
\ No newline at end of file
+bpy.types.register(Buttons_MT_view)

Modified: branches/blender2.5/blender/release/ui/space_image.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_image.py	2009-06-23 00:09:26 UTC (rev 21094)
+++ branches/blender2.5/blender/release/ui/space_image.py	2009-06-23 00:19:10 UTC (rev 21095)
@@ -177,9 +177,9 @@
 
 		layout.itemS()
 
-		layout.itemM(context, "IMAGE_MT_uvs_transform")
-		layout.itemM(context, "IMAGE_MT_uvs_mirror")
-		layout.itemM(context, "IMAGE_MT_uvs_weldalign")
+		layout.itemM("IMAGE_MT_uvs_transform")
+		layout.itemM("IMAGE_MT_uvs_mirror")
+		layout.itemM("IMAGE_MT_uvs_weldalign")
 
 		layout.itemS()
 
@@ -188,7 +188,7 @@
 
 		layout.itemS()
 
-		layout.itemM(context, "IMAGE_MT_uvs_showhide")
+		layout.itemM("IMAGE_MT_uvs_showhide")
 
 class IMAGE_HT_header(bpy.types.Header):
 	__space_type__ = "IMAGE_EDITOR"
@@ -202,23 +202,23 @@
 		show_paint = sima.show_paint
 		show_uvedit = sima.show_uvedit
 
-		layout.template_header(context)
+		layout.template_header()
 
 		# menus
 		if context.area.show_menus:
 			row = layout.row()
-			row.itemM(context, "IMAGE_MT_view")
+			row.itemM("IMAGE_MT_view")
 
 			if show_uvedit:
-				row.itemM(context, "IMAGE_MT_select")
+				row.itemM("IMAGE_MT_select")
 
 			# XXX menuname= (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))? "Image*": "Image";
-			row.itemM(context, "IMAGE_MT_image")
+			row.itemM("IMAGE_MT_image")
 
 			if show_uvedit:
-				row.itemM(context, "IMAGE_MT_uvs")
+				row.itemM("IMAGE_MT_uvs")
 
-		layout.template_ID(context, sima, "image", new="IMAGE_OT_new", open="IMAGE_OT_open")
+		layout.template_ID(sima, "image", new="IMAGE_OT_new", open="IMAGE_OT_open")
 
 		"""
 		/* image select */
@@ -595,9 +595,9 @@
 
 		layout.itemS()
 
-		layout.itemM(context, "IMAGE_MT_uvs_transform")
-		layout.itemM(context, "IMAGE_MT_uvs_mirror")
-		layout.itemM(context, "IMAGE_MT_uvs_weldalign")
+		layout.itemM("IMAGE_MT_uvs_transform")
+		layout.itemM("IMAGE_MT_uvs_mirror")
+		layout.itemM("IMAGE_MT_uvs_weldalign")
 
 		layout.itemS()
 
@@ -606,7 +606,7 @@
 
 		layout.itemS()
 
-		layout.itemM(context, "IMAGE_MT_uvs_showhide")
+		layout.itemM("IMAGE_MT_uvs_showhide")
 
 class IMAGE_HT_header(bpy.types.Header):
 	__space_type__ = "IMAGE_EDITOR"
@@ -620,23 +620,23 @@
 		show_paint = sima.show_paint
 		show_uvedit = sima.show_uvedit
 
-		layout.template_header(context)
+		layout.template_header()
 
 		# menus
 		if context.area.show_menus:
 			row = layout.row()

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list