diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-31 16:31:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-31 16:31:23 +0300 |
| commit | ea265fc69702566a846be3005d9fd814a10d7d54 (patch) | |
| tree | 011f35edde76ca7519c6e4bfc9acb01c0d39774e /release/scripts | |
| parent | 85eb9d6a2f0a0d94f795fc5264670e85ad56992f (diff) | |
change blender python interface for classes not to ise __idname__ rather bl_idname since __somename__ is for pythons internal use.
replacements...
"__idname__" -> "bl_idname"
"__props__" -> "bl_props"
"__label__" -> "bl_label"
"__register__" -> "bl_register"
"__undo__" -> "bl_undo"
"__space_type__" -> "bl_space_type"
"__default_closed__" -> "bl_default_closed"
"__region_type__" -> "bl_region_type"
"__context__" -> "bl_context"
"__show_header__" -> "bl_show_header"
"__URL__" -> "_url"
Diffstat (limited to 'release/scripts')
56 files changed, 719 insertions, 719 deletions
diff --git a/release/scripts/io/add_mesh_torus.py b/release/scripts/io/add_mesh_torus.py index f413fe72e4d..1f5d4a25229 100644 --- a/release/scripts/io/add_mesh_torus.py +++ b/release/scripts/io/add_mesh_torus.py @@ -49,11 +49,11 @@ def add_torus(PREF_MAJOR_RAD, PREF_MINOR_RAD, PREF_MAJOR_SEG, PREF_MINOR_SEG): class MESH_OT_primitive_torus_add(bpy.types.Operator): '''Add a torus mesh.''' - __idname__ = "mesh.primitive_torus_add" - __label__ = "Add Torus" - __register__ = True - __undo__ = True - __props__ = [ + bl_idname = "mesh.primitive_torus_add" + bl_label = "Add Torus" + bl_register = True + bl_undo = True + bl_props = [ bpy.props.FloatProperty(attr="major_radius", name="Major Radius", description="Number of segments for the main ring of the torus", default= 1.0, min= 0.01, max= 100.0), bpy.props.FloatProperty(attr="minor_radius", name="Minor Radius", description="Number of segments for the minor ring of the torus", default= 0.25, min= 0.01, max= 100.0), bpy.props.IntProperty(attr="major_segments", name="Major Segments", description="Number of segments for the main ring of the torus", default= 48, min= 3, max= 256), diff --git a/release/scripts/io/engine_render_pov.py b/release/scripts/io/engine_render_pov.py index f69c8a267e0..6e5edfb5e05 100644 --- a/release/scripts/io/engine_render_pov.py +++ b/release/scripts/io/engine_render_pov.py @@ -697,8 +697,8 @@ IntProperty( attr="pov_radio_recursion_limit", class PovrayRender(bpy.types.RenderEngine): - __idname__ = 'POVRAY_RENDER' - __label__ = "Povray" + bl_idname = 'POVRAY_RENDER' + bl_label = "Povray" DELAY = 0.02 def _export(self, scene): @@ -850,9 +850,9 @@ for member in dir(buttons_material): del buttons_material class RenderButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "render" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "render" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): @@ -860,7 +860,7 @@ class RenderButtonsPanel(bpy.types.Panel): return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES) class RENDER_PT_povray_radiosity(RenderButtonsPanel): - __label__ = "Radiosity" + bl_label = "Radiosity" COMPAT_ENGINES = set(['POVRAY_RENDER']) def draw_header(self, context): diff --git a/release/scripts/io/export_3ds.py b/release/scripts/io/export_3ds.py index 99913523fd3..c31847a99a7 100644 --- a/release/scripts/io/export_3ds.py +++ b/release/scripts/io/export_3ds.py @@ -1093,13 +1093,13 @@ def save_3ds(filename, context): class EXPORT_OT_autodesk_3ds(bpy.types.Operator): '''Export to 3DS file format (.3ds).''' - __idname__ = "export.autodesk_3ds" - __label__ = 'Export 3DS' + bl_idname = "export.autodesk_3ds" + bl_label = 'Export 3DS' # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ # bpy.props.StringProperty(attr="filename", name="File Name", description="File name used for exporting the 3DS file", maxlen= 1024, default= ""), bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the 3DS file", maxlen= 1024, default= ""), ] diff --git a/release/scripts/io/export_fbx.py b/release/scripts/io/export_fbx.py index d159c6588e5..4c3fd727169 100644 --- a/release/scripts/io/export_fbx.py +++ b/release/scripts/io/export_fbx.py @@ -3335,13 +3335,13 @@ def write_ui(): class EXPORT_OT_fbx(bpy.types.Operator): '''Selection to an ASCII Autodesk FBX''' - __idname__ = "export.fbx" - __label__ = "Export FBX" + bl_idname = "export.fbx" + bl_label = "Export FBX" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the FBX file", maxlen= 1024, default= ""), bpy.props.BoolProperty(attr="EXP_OBS_SELECTED", name="Selected Objects", description="Export selected objects on visible layers", default=True), diff --git a/release/scripts/io/export_mdd.py b/release/scripts/io/export_mdd.py index 1336660aefc..9a2ba6fe67d 100644 --- a/release/scripts/io/export_mdd.py +++ b/release/scripts/io/export_mdd.py @@ -135,8 +135,8 @@ def write(filename, sce, ob, PREF_STARTFRAME, PREF_ENDFRAME, PREF_FPS): class EXPORT_OT_mdd(bpy.types.Operator): '''Animated mesh to MDD vertex keyframe file.''' - __idname__ = "export.mdd" - __label__ = "Export MDD" + bl_idname = "export.mdd" + bl_label = "Export MDD" # get first scene to get min and max properties for frames, fps @@ -148,7 +148,7 @@ class EXPORT_OT_mdd(bpy.types.Operator): # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the MDD file", maxlen= 1024, default= "tmp.mdd"), bpy.props.IntProperty(attr="fps", name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default= 25), bpy.props.IntProperty(attr="start_frame", name="Start Frame", description="Start frame for baking", min=minframe,max=maxframe,default=1), diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 1e8a152e91f..641ebec3150 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -916,13 +916,13 @@ Currently the exporter lacks these features: class EXPORT_OT_obj(bpy.types.Operator): '''Save a Wavefront OBJ File''' - __idname__ = "export.obj" - __label__ = 'Export OBJ' + bl_idname = "export.obj" + bl_label = 'Export OBJ' # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the OBJ file", maxlen= 1024, default= ""), # context group diff --git a/release/scripts/io/export_ply.py b/release/scripts/io/export_ply.py index 953ed4dc89e..67cd6a85599 100644 --- a/release/scripts/io/export_ply.py +++ b/release/scripts/io/export_ply.py @@ -233,13 +233,13 @@ def write(filename, scene, ob, \ class EXPORT_OT_ply(bpy.types.Operator): '''Export a single object as a stanford PLY with normals, colours and texture coordinates.''' - __idname__ = "export.ply" - __label__ = "Export PLY" + bl_idname = "export.ply" + bl_label = "Export PLY" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the PLY file", maxlen= 1024, default= ""), bpy.props.BoolProperty(attr="use_modifiers", name="Apply Modifiers", description="Apply Modifiers to the exported mesh", default= True), bpy.props.BoolProperty(attr="use_normals", name="Export Normals", description="Export Normals for smooth and hard shaded faces", default= True), diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py index 2c6ca749757..ad9abc5162a 100644 --- a/release/scripts/io/export_x3d.py +++ b/release/scripts/io/export_x3d.py @@ -1198,13 +1198,13 @@ def x3d_export_ui(filename): class EXPORT_OT_x3d(bpy.types.Operator): '''Export selection to Extensible 3D file (.x3d)''' - __idname__ = "export.x3d" - __label__ = 'Export X3D' + bl_idname = "export.x3d" + bl_label = 'Export X3D' # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the X3D file", maxlen= 1024, default= ""), bpy.props.BoolProperty(attr="apply_modifiers", name="Apply Modifiers", description="Use transformed mesh data from each object.", default=True), diff --git a/release/scripts/io/import_3ds.py b/release/scripts/io/import_3ds.py index da0634a26d7..38eef583ecd 100644 --- a/release/scripts/io/import_3ds.py +++ b/release/scripts/io/import_3ds.py @@ -1124,13 +1124,13 @@ else: class IMPORT_OT_autodesk_3ds(bpy.types.Operator): '''Import from 3DS file format (.3ds)''' - __idname__ = "import.autodesk_3ds" - __label__ = 'Import 3DS' + bl_idname = "import.autodesk_3ds" + bl_label = 'Import 3DS' # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for importing the 3DS file", maxlen= 1024, default= ""), # bpy.props.FloatProperty(attr="size_constraint", name="Size Constraint", description="Scale the model by 10 until it reacehs the size constraint. Zero Disables.", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=10.0), diff --git a/release/scripts/io/import_obj.py b/release/scripts/io/import_obj.py index a557e4427d8..eaa76942a11 100644 --- a/release/scripts/io/import_obj.py +++ b/release/scripts/io/import_obj.py @@ -1555,13 +1555,13 @@ else: class IMPORT_OT_obj(bpy.types.Operator): '''Load a Wavefront OBJ File.''' - __idname__ = "import.obj" - __label__ = "Import OBJ" + bl_idname = "import.obj" + bl_label = "Import OBJ" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for importing the OBJ file", maxlen= 1024, default= ""), bpy.props.BoolProperty(attr="CREATE_SMOOTH_GROUPS", name="Smooth Groups", description="Surround smooth groups by sharp edges", default= True), diff --git a/release/scripts/io/mesh_skin.py b/release/scripts/io/mesh_skin.py index f6fafc41111..c7528c984b2 100644 --- a/release/scripts/io/mesh_skin.py +++ b/release/scripts/io/mesh_skin.py @@ -620,13 +620,13 @@ def main(context): class MESH_OT_skin(bpy.types.Operator): '''Bridge face loops.''' - __idname__ = "mesh.skin" - __label__ = "Add Torus" - __register__ = True - __undo__ = True + bl_idname = "mesh.skin" + bl_label = "Add Torus" + bl_register = True + bl_undo = True ''' - __props__ = [ + bl_props = [ bpy.props.EnumProperty(attr="loft_method", items=[(), ()], description="", default= True), ] ''' diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index d4a7b242cab..f08e292ab2a 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -159,8 +159,8 @@ def requestResult(conn, job_id, frame): @rnaType class NetworkRenderEngine(bpy.types.RenderEngine): - __idname__ = 'NET_RENDER' - __label__ = "Network Render" + bl_idname = 'NET_RENDER' + bl_label = "Network Render" def render(self, scene): if scene.network_render.mode == "RENDER_CLIENT": self.render_client(scene) diff --git a/release/scripts/io/netrender/operators.py b/release/scripts/io/netrender/operators.py index e46b0c7b888..468cbba6564 100644 --- a/release/scripts/io/netrender/operators.py +++ b/release/scripts/io/netrender/operators.py @@ -10,13 +10,13 @@ import netrender.model @rnaOperator class RENDER_OT_netclientanim(bpy.types.Operator): '''Start rendering an animation on network''' - __idname__ = "render.netclientanim" - __label__ = "Animation on network" + bl_idname = "render.netclientanim" + bl_label = "Animation on network" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -41,13 +41,13 @@ class RENDER_OT_netclientanim(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientsend(bpy.types.Operator): '''Send Render Job to the Network''' - __idname__ = "render.netclientsend" - __label__ = "Send job" + bl_idname = "render.netclientsend" + bl_label = "Send job" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -70,13 +70,13 @@ class RENDER_OT_netclientsend(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientstatus(bpy.types.Operator): '''Refresh the status of the current jobs''' - __idname__ = "render.netclientstatus" - __label__ = "Client Status" + bl_idname = "render.netclientstatus" + bl_label = "Client Status" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -115,13 +115,13 @@ class RENDER_OT_netclientstatus(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientblacklistslave(bpy.types.Operator): '''Operator documentation text, will be used for the operator tooltip and python docs.''' - __idname__ = "render.netclientblacklistslave" - __label__ = "Client Blacklist Slave" + bl_idname = "render.netclientblacklistslave" + bl_label = "Client Blacklist Slave" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -150,13 +150,13 @@ class RENDER_OT_netclientblacklistslave(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientwhitelistslave(bpy.types.Operator): '''Operator documentation text, will be used for the operator tooltip and python docs.''' - __idname__ = "render.netclientwhitelistslave" - __label__ = "Client Whitelist Slave" + bl_idname = "render.netclientwhitelistslave" + bl_label = "Client Whitelist Slave" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -186,13 +186,13 @@ class RENDER_OT_netclientwhitelistslave(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientslaves(bpy.types.Operator): '''Refresh status about available Render slaves''' - __idname__ = "render.netclientslaves" - __label__ = "Client Slaves" + bl_idname = "render.netclientslaves" + bl_label = "Client Slaves" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -236,13 +236,13 @@ class RENDER_OT_netclientslaves(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientcancel(bpy.types.Operator): '''Cancel the selected network rendering job.''' - __idname__ = "render.netclientcancel" - __label__ = "Client Cancel" + bl_idname = "render.netclientcancel" + bl_label = "Client Cancel" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): netsettings = context.scene.network_render @@ -270,13 +270,13 @@ class RENDER_OT_netclientcancel(bpy.types.Operator): @rnaOperator class RENDER_OT_netclientcancelall(bpy.types.Operator): '''Cancel all running network rendering jobs.''' - __idname__ = "render.netclientcancelall" - __label__ = "Client Cancel All" + bl_idname = "render.netclientcancelall" + bl_label = "Client Cancel All" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -302,13 +302,13 @@ class RENDER_OT_netclientcancelall(bpy.types.Operator): @rnaOperator class netclientdownload(bpy.types.Operator): '''Download render results from the network''' - __idname__ = "render.netclientdownload" - __label__ = "Client Download" + bl_idname = "render.netclientdownload" + bl_label = "Client Download" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): netsettings = context.scene.network_render @@ -352,13 +352,13 @@ class netclientdownload(bpy.types.Operator): @rnaOperator class netclientscan(bpy.types.Operator): '''Operator documentation text, will be used for the operator tooltip and python docs.''' - __idname__ = "render.netclientscan" - __label__ = "Client Scan" + bl_idname = "render.netclientscan" + bl_label = "Client Scan" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True @@ -390,13 +390,13 @@ class netclientscan(bpy.types.Operator): @rnaOperator class netclientweb(bpy.types.Operator): '''Open new window with information about running rendering jobs''' - __idname__ = "render.netclientweb" - __label__ = "Open Master Monitor" + bl_idname = "render.netclientweb" + bl_label = "Open Master Monitor" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - __props__ = [] + bl_props = [] def poll(self, context): return True diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index 7d7f3c29630..b0ae5815915 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -18,9 +18,9 @@ DONE = 2 ERROR = 3 class RenderButtonsPanel(bpy.types.Panel): - __space_type__ = "PROPERTIES" - __region_type__ = "WINDOW" - __context__ = "render" + bl_space_type = "PROPERTIES" + bl_region_type = "WINDOW" + bl_context = "render" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): @@ -30,7 +30,7 @@ class RenderButtonsPanel(bpy.types.Panel): # Setting panel, use in the scene for now. @rnaType class RENDER_PT_network_settings(RenderButtonsPanel): - __label__ = "Network Settings" + bl_label = "Network Settings" COMPAT_ENGINES = set(['NET_RENDER']) def draw(self, context): @@ -56,7 +56,7 @@ class RENDER_PT_network_settings(RenderButtonsPanel): @rnaType class RENDER_PT_network_job(RenderButtonsPanel): - __label__ = "Job Settings" + bl_label = "Job Settings" COMPAT_ENGINES = set(['NET_RENDER']) def poll(self, context): @@ -84,7 +84,7 @@ class RENDER_PT_network_job(RenderButtonsPanel): @rnaType class RENDER_PT_network_slaves(RenderButtonsPanel): - __label__ = "Slaves Status" + bl_label = "Slaves Status" COMPAT_ENGINES = set(['NET_RENDER']) def poll(self, context): @@ -120,7 +120,7 @@ class RENDER_PT_network_slaves(RenderButtonsPanel): @rnaType class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel): - __label__ = "Slaves Blacklist" + bl_label = "Slaves Blacklist" COMPAT_ENGINES = set(['NET_RENDER']) def poll(self, context): @@ -155,7 +155,7 @@ class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel): @rnaType class RENDER_PT_network_jobs(RenderButtonsPanel): - __label__ = "Jobs" + bl_label = "Jobs" COMPAT_ENGINES = set(['NET_RENDER']) def poll(self, context): diff --git a/release/scripts/modules/bpy_ops.py b/release/scripts/modules/bpy_ops.py index e7f4b60ee98..eb793b1b7bc 100644 --- a/release/scripts/modules/bpy_ops.py +++ b/release/scripts/modules/bpy_ops.py @@ -151,7 +151,7 @@ class bpy_ops_submodule_op(object): def get_rna(self): ''' - currently only used for '__rna__' + currently only used for 'bl_rna' ''' return op_get_rna(self.idname()) @@ -173,8 +173,8 @@ from bpy.props import * class MESH_OT_delete_edgeloop(bpy.types.Operator): '''Export a single object as a stanford PLY with normals, colours and texture coordinates.''' - __idname__ = "mesh.delete_edgeloop" - __label__ = "Delete Edge Loop" + bl_idname = "mesh.delete_edgeloop" + bl_label = "Delete Edge Loop" def execute(self, context): bpy.ops.tfm.edge_slide(value=1.0) @@ -218,9 +218,9 @@ def execute_context_assign(self, context): class WM_OT_context_set_boolean(bpy.types.Operator): '''Set a context value.''' - __idname__ = "wm.context_set_boolean" - __label__ = "Context Set" - __props__ = [ + bl_idname = "wm.context_set_boolean" + bl_label = "Context Set" + bl_props = [ rna_path_prop, BoolProperty(attr="value", name="Value", description="Assignment value", default=True)] @@ -230,9 +230,9 @@ class WM_OT_context_set_boolean(bpy.types.Operator): class WM_OT_context_set_int(bpy.types.Operator): # same as enum '''Set a context value.''' - __idname__ = "wm.context_set_int" - __label__ = "Context Set" - __props__ = [ + bl_idname = "wm.context_set_int" + bl_label = "Context Set" + bl_props = [ rna_path_prop, IntProperty(attr="value", name="Value", description="Assignment value", default=0)] @@ -241,9 +241,9 @@ class WM_OT_context_set_int(bpy.types.Operator): # same as enum class WM_OT_context_set_float(bpy.types.Operator): # same as enum '''Set a context value.''' - __idname__ = "wm.context_set_int" - __label__ = "Context Set" - __props__ = [ + bl_idname = "wm.context_set_int" + bl_label = "Context Set" + bl_props = [ rna_path_prop, FloatProperty(attr="value", name="Value", description="Assignment value", default=0.0)] @@ -252,9 +252,9 @@ class WM_OT_context_set_float(bpy.types.Operator): # same as enum class WM_OT_context_set_string(bpy.types.Operator): # same as enum '''Set a context value.''' - __idname__ = "wm.context_set_string" - __label__ = "Context Set" - __props__ = [ + bl_idname = "wm.context_set_string" + bl_label = "Context Set" + bl_props = [ rna_path_prop, StringProperty(attr="value", name="Value", description="Assignment value", maxlen=1024, default="")] @@ -264,9 +264,9 @@ class WM_OT_context_set_string(bpy.types.Operator): # same as enum class WM_OT_context_set_enum(bpy.types.Operator): '''Set a context value.''' - __idname__ = "wm.context_set_enum" - __label__ = "Context Set" - __props__ = [ + bl_idname = "wm.context_set_enum" + bl_label = "Context Set" + bl_props = [ rna_path_prop, StringProperty(attr="value", name="Value", description="Assignment value (as a string)", @@ -277,9 +277,9 @@ class WM_OT_context_set_enum(bpy.types.Operator): class WM_OT_context_toggle(bpy.types.Operator): '''Toggle a context value.''' - __idname__ = "wm.context_toggle" - __label__ = "Context Toggle" - __props__ = [rna_path_prop] + bl_idname = "wm.context_toggle" + bl_label = "Context Toggle" + bl_props = [rna_path_prop] def execute(self, context): @@ -292,9 +292,9 @@ class WM_OT_context_toggle(bpy.types.Operator): class WM_OT_context_toggle_enum(bpy.types.Operator): '''Toggle a context value.''' - __idname__ = "wm.context_toggle_enum" - __label__ = "Context Toggle Values" - __props__ = [ + bl_idname = "wm.context_toggle_enum" + bl_label = "Context Toggle Values" + bl_props = [ rna_path_prop, StringProperty(attr="value_1", name="Value", \ description="Toggle enum", maxlen=1024, default=""), @@ -316,9 +316,9 @@ class WM_OT_context_toggle_enum(bpy.types.Operator): class WM_OT_context_cycle_int(bpy.types.Operator): '''Set a context value. Useful for cycling active material, vertex keys, groups' etc.''' - __idname__ = "wm.context_cycle_int" - __label__ = "Context Int Cycle" - __props__ = [rna_path_prop, rna_reverse_prop] + bl_idname = "wm.context_cycle_int" + bl_label = "Context Int Cycle" + bl_props = [rna_path_prop, rna_reverse_prop] def execute(self, context): @@ -346,9 +346,9 @@ class WM_OT_context_cycle_int(bpy.types.Operator): class WM_OT_context_cycle_enum(bpy.types.Operator): '''Toggle a context value.''' - __idname__ = "wm.context_cycle_enum" - __label__ = "Context Enum Cycle" - __props__ = [rna_path_prop, rna_reverse_prop] + bl_idname = "wm.context_cycle_enum" + bl_label = "Context Enum Cycle" + bl_props = [rna_path_prop, rna_reverse_prop] def execute(self, context): @@ -401,14 +401,14 @@ doc_new = StringProperty(attr="doc_new", name="Doc New", class WM_OT_doc_view(bpy.types.Operator): '''Load online reference docs''' - __idname__ = "wm.doc_view" - __label__ = "View Documentation" - __props__ = [doc_id] + bl_idname = "wm.doc_view" + bl_label = "View Documentation" + bl_props = [doc_id] _prefix = 'http://www.blender.org/documentation/250PythonDoc' def _nested_class_string(self, class_string): ls = [] - class_obj = getattr(bpy.types, class_string, None).__rna__ + class_obj = getattr(bpy.types, class_string, None).bl_rna while class_obj: ls.insert(0, class_obj) class_obj = class_obj.nested @@ -442,9 +442,9 @@ class WM_OT_doc_view(bpy.types.Operator): class WM_OT_doc_edit(bpy.types.Operator): '''Load online reference docs''' - __idname__ = "wm.doc_edit" - __label__ = "Edit Documentation" - __props__ = [doc_id, doc_new] + bl_idname = "wm.doc_edit" + bl_label = "Edit Documentation" + bl_props = [doc_id, doc_new] _url = "http://www.mindrones.com/blender/svn/xmlrpc.php" def _send_xmlrpc(self, data_dict): @@ -472,7 +472,7 @@ class WM_OT_doc_edit(bpy.types.Operator): upload = {} if op_class: - rna = op_class.__rna__ + rna = op_class.bl_rna doc_orig = rna.description if doc_orig == self.doc_new: return 'OPERATOR_CANCELLED' @@ -484,7 +484,7 @@ class WM_OT_doc_edit(bpy.types.Operator): self._send_xmlrpc(upload) else: - rna = getattr(bpy.types, class_name).__rna__ + rna = getattr(bpy.types, class_name).bl_rna doc_orig = rna.properties[class_prop].description if doc_orig == self.doc_new: return 'OPERATOR_CANCELLED' diff --git a/release/scripts/templates/operator.py b/release/scripts/templates/operator.py index 7e3dad93ad8..30d4ad83dc6 100644 --- a/release/scripts/templates/operator.py +++ b/release/scripts/templates/operator.py @@ -3,14 +3,14 @@ def write_some_data(context, path, use_some_setting): class ExportSomeData(bpy.types.Operator): '''This appiers in the tooltip of the operator and in the generated docs.''' - __idname__ = "export.some_data" # this is important since its how bpy.ops.export.some_data is constructed - __label__ = "Export Some Data" + bl_idname = "export.some_data" # this is important since its how bpy.ops.export.some_data is constructed + bl_label = "Export Some Data" # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. # TODO, add better example props - __props__ = [ + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path used for exporting the PLY file", maxlen= 1024, default= ""), bpy.props.BoolProperty(attr="use_some_setting", name="Apply Modifiers", description="Apply Modifiers to the exported mesh", default= True), ] diff --git a/release/scripts/templates/operator_simple.py b/release/scripts/templates/operator_simple.py index b82543c3bf8..f0f4b104950 100644 --- a/release/scripts/templates/operator_simple.py +++ b/release/scripts/templates/operator_simple.py @@ -4,8 +4,8 @@ def main(context): class SimpleOperator(bpy.types.Operator): '''''' - __idname__ = "object.simple_operator" - __label__ = "Simple Object Operator" + bl_idname = "object.simple_operator" + bl_label = "Simple Object Operator" def poll(self, context): return context.active_object != None diff --git a/release/scripts/ui/buttons_data_armature.py b/release/scripts/ui/buttons_data_armature.py index 0fb00b03961..db635be763c 100644 --- a/release/scripts/ui/buttons_data_armature.py +++ b/release/scripts/ui/buttons_data_armature.py @@ -2,15 +2,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return context.armature class DATA_PT_context_arm(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -29,7 +29,7 @@ class DATA_PT_context_arm(DataButtonsPanel): split.itemS() class DATA_PT_skeleton(DataButtonsPanel): - __label__ = "Skeleton" + bl_label = "Skeleton" def draw(self, context): layout = self.layout @@ -56,7 +56,7 @@ class DATA_PT_skeleton(DataButtonsPanel): col.itemR(arm, "deform_bbone_rest", text="B-Bones Rest") class DATA_PT_display(DataButtonsPanel): - __label__ = "Display" + bl_label = "Display" def draw(self, context): layout = self.layout @@ -73,7 +73,7 @@ class DATA_PT_display(DataButtonsPanel): flow.itemR(arm, "delay_deform", text="Delay Refresh") class DATA_PT_bone_groups(DataButtonsPanel): - __label__ = "Bone Groups" + bl_label = "Bone Groups" def poll(self, context): return (context.object and context.object.type=='ARMATURE' and context.object.pose) @@ -113,7 +113,7 @@ class DATA_PT_bone_groups(DataButtonsPanel): #row.itemO("object.bone_group_deselect", text="Deselect") class DATA_PT_paths(DataButtonsPanel): - __label__ = "Paths" + bl_label = "Paths" def draw(self, context): layout = self.layout @@ -149,7 +149,7 @@ class DATA_PT_paths(DataButtonsPanel): row.itemO("pose.paths_clear", text="Clear Paths") class DATA_PT_ghost(DataButtonsPanel): - __label__ = "Ghost" + bl_label = "Ghost" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_bone.py b/release/scripts/ui/buttons_data_bone.py index 56a1b048594..a3ac86fa841 100644 --- a/release/scripts/ui/buttons_data_bone.py +++ b/release/scripts/ui/buttons_data_bone.py @@ -2,15 +2,15 @@ import bpy class BoneButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "bone" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "bone" def poll(self, context): return (context.bone or context.edit_bone) class BONE_PT_context_bone(BoneButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -24,7 +24,7 @@ class BONE_PT_context_bone(BoneButtonsPanel): row.itemR(bone, "name", text="") class BONE_PT_transform(BoneButtonsPanel): - __label__ = "Transform" + bl_label = "Transform" def draw(self, context): layout = self.layout @@ -69,8 +69,8 @@ class BONE_PT_transform(BoneButtonsPanel): layout.itemR(pchan, "rotation_mode") class BONE_PT_transform_locks(BoneButtonsPanel): - __label__ = "Transform Locks" - __default_closed__ = True + bl_label = "Transform Locks" + bl_default_closed = True def poll(self, context): return context.bone @@ -99,7 +99,7 @@ class BONE_PT_transform_locks(BoneButtonsPanel): row.column().itemR(pchan, "lock_scale") class BONE_PT_relations(BoneButtonsPanel): - __label__ = "Relations" + bl_label = "Relations" def draw(self, context): layout = self.layout @@ -140,7 +140,7 @@ class BONE_PT_relations(BoneButtonsPanel): sub.itemR(bone, "inherit_scale", text="Inherit Scale") class BONE_PT_display(BoneButtonsPanel): - __label__ = "Display" + bl_label = "Display" def poll(self, context): return context.bone @@ -173,8 +173,8 @@ class BONE_PT_display(BoneButtonsPanel): col.itemR(pchan, "custom_shape", text="") class BONE_PT_deform(BoneButtonsPanel): - __label__ = "Deform" - __default_closed__ = True + bl_label = "Deform" + bl_default_closed = True def draw_header(self, context): bone = context.bone diff --git a/release/scripts/ui/buttons_data_camera.py b/release/scripts/ui/buttons_data_camera.py index 19d7dfef852..c76d2633a51 100644 --- a/release/scripts/ui/buttons_data_camera.py +++ b/release/scripts/ui/buttons_data_camera.py @@ -2,15 +2,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return context.camera class DATA_PT_context_camera(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -29,7 +29,7 @@ class DATA_PT_context_camera(DataButtonsPanel): split.itemS() class DATA_PT_camera(DataButtonsPanel): - __label__ = "Lens" + bl_label = "Lens" def draw(self, context): layout = self.layout @@ -70,7 +70,7 @@ class DATA_PT_camera(DataButtonsPanel): row.itemR(cam, "dof_distance", text="Distance") class DATA_PT_camera_display(DataButtonsPanel): - __label__ = "Display" + bl_label = "Display" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_curve.py b/release/scripts/ui/buttons_data_curve.py index 393bbf12756..e86af9bf3ab 100644 --- a/release/scripts/ui/buttons_data_curve.py +++ b/release/scripts/ui/buttons_data_curve.py @@ -2,9 +2,9 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return (context.object and context.object.type in ('CURVE', 'SURFACE') and context.curve) @@ -25,7 +25,7 @@ class DataButtonsPanelActive(DataButtonsPanel): return (curve and curve.active_spline) class DATA_PT_context_curve(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -44,7 +44,7 @@ class DATA_PT_context_curve(DataButtonsPanel): split.itemS() class DATA_PT_shape_curve(DataButtonsPanel): - __label__ = "Shape" + bl_label = "Shape" def draw(self, context): layout = self.layout @@ -96,7 +96,7 @@ class DATA_PT_shape_curve(DataButtonsPanel): # col.itemR(curve, "vertex_normal_flip") class DATA_PT_geometry_curve(DataButtonsPanel): - __label__ = "Geometry" + bl_label = "Geometry" def draw(self, context): layout = self.layout @@ -120,7 +120,7 @@ class DATA_PT_geometry_curve(DataButtonsPanel): col.itemR(curve, "bevel_object", text="") class DATA_PT_pathanim(DataButtonsPanelCurve): - __label__ = "Path Animation" + bl_label = "Path Animation" def draw_header(self, context): curve = context.curve @@ -146,7 +146,7 @@ class DATA_PT_pathanim(DataButtonsPanelCurve): col.itemR(curve, "use_time_offset", text="Offset Children") class DATA_PT_active_spline(DataButtonsPanelActive): - __label__ = "Active Spline" + bl_label = "Active Spline" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_empty.py b/release/scripts/ui/buttons_data_empty.py index eda6cced0ae..652f470a605 100644 --- a/release/scripts/ui/buttons_data_empty.py +++ b/release/scripts/ui/buttons_data_empty.py @@ -2,15 +2,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return (context.object and context.object.type == 'EMPTY') class DATA_PT_empty(DataButtonsPanel): - __label__ = "Empty" + bl_label = "Empty" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_lamp.py b/release/scripts/ui/buttons_data_lamp.py index 4e495d158eb..74c4ba012df 100644 --- a/release/scripts/ui/buttons_data_lamp.py +++ b/release/scripts/ui/buttons_data_lamp.py @@ -2,21 +2,21 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return context.lamp class DATA_PT_preview(DataButtonsPanel): - __label__ = "Preview" + bl_label = "Preview" def draw(self, context): self.layout.template_preview(context.lamp) class DATA_PT_context_lamp(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -35,7 +35,7 @@ class DATA_PT_context_lamp(DataButtonsPanel): split.itemS() class DATA_PT_lamp(DataButtonsPanel): - __label__ = "Lamp" + bl_label = "Lamp" def draw(self, context): layout = self.layout @@ -75,7 +75,7 @@ class DATA_PT_lamp(DataButtonsPanel): col.itemR(lamp, "diffuse") class DATA_PT_sunsky(DataButtonsPanel): - __label__ = "Sky & Atmosphere" + bl_label = "Sky & Atmosphere" def poll(self, context): lamp = context.lamp @@ -139,7 +139,7 @@ class DATA_PT_sunsky(DataButtonsPanel): sub.itemR(lamp, "atmosphere_extinction", slider=True ,text="Extinction") class DATA_PT_shadow(DataButtonsPanel): - __label__ = "Shadow" + bl_label = "Shadow" def poll(self, context): lamp = context.lamp @@ -237,7 +237,7 @@ class DATA_PT_shadow(DataButtonsPanel): sub.itemR(lamp, "shadow_buffer_clip_end", text=" Clip End") class DATA_PT_area(DataButtonsPanel): - __label__ = "Area Shape" + bl_label = "Area Shape" def poll(self, context): lamp = context.lamp @@ -261,7 +261,7 @@ class DATA_PT_area(DataButtonsPanel): sub.itemR(lamp, "size_y", text="Size Y") class DATA_PT_spot(DataButtonsPanel): - __label__ = "Spot Shape" + bl_label = "Spot Shape" def poll(self, context): lamp = context.lamp @@ -289,8 +289,8 @@ class DATA_PT_spot(DataButtonsPanel): sub.itemR(lamp, "halo_step", text="Step") class DATA_PT_falloff_curve(DataButtonsPanel): - __label__ = "Falloff Curve" - __default_closed__ = True + bl_label = "Falloff Curve" + bl_default_closed = True def poll(self, context): lamp = context.lamp diff --git a/release/scripts/ui/buttons_data_lattice.py b/release/scripts/ui/buttons_data_lattice.py index bc977860330..3272e1ccf55 100644 --- a/release/scripts/ui/buttons_data_lattice.py +++ b/release/scripts/ui/buttons_data_lattice.py @@ -2,15 +2,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return context.lattice class DATA_PT_context_lattice(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -29,7 +29,7 @@ class DATA_PT_context_lattice(DataButtonsPanel): split.itemS() class DATA_PT_lattice(DataButtonsPanel): - __label__ = "Lattice" + bl_label = "Lattice" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_mesh.py b/release/scripts/ui/buttons_data_mesh.py index 77c6f834073..f0120b58c6d 100644 --- a/release/scripts/ui/buttons_data_mesh.py +++ b/release/scripts/ui/buttons_data_mesh.py @@ -2,15 +2,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return context.mesh class DATA_PT_context_mesh(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -29,7 +29,7 @@ class DATA_PT_context_mesh(DataButtonsPanel): split.itemS() class DATA_PT_normals(DataButtonsPanel): - __label__ = "Normals" + bl_label = "Normals" def draw(self, context): layout = self.layout @@ -49,7 +49,7 @@ class DATA_PT_normals(DataButtonsPanel): col.itemR(mesh, "double_sided") class DATA_PT_settings(DataButtonsPanel): - __label__ = "Settings" + bl_label = "Settings" def draw(self, context): layout = self.layout @@ -62,7 +62,7 @@ class DATA_PT_settings(DataButtonsPanel): col.itemR(mesh, "texture_mesh") class DATA_PT_vertex_groups(DataButtonsPanel): - __label__ = "Vertex Groups" + bl_label = "Vertex Groups" def poll(self, context): return (context.object and context.object.type in ('MESH', 'LATTICE')) @@ -106,7 +106,7 @@ class DATA_PT_vertex_groups(DataButtonsPanel): layout.itemR(context.tool_settings, "vertex_group_weight", text="Weight") class DATA_PT_shape_keys(DataButtonsPanel): - __label__ = "Shape Keys" + bl_label = "Shape Keys" def poll(self, context): return (context.object and context.object.type in ('MESH', 'LATTICE', 'CURVE', 'SURFACE')) @@ -191,7 +191,7 @@ class DATA_PT_shape_keys(DataButtonsPanel): row.itemR(key, "slurph") class DATA_PT_uv_texture(DataButtonsPanel): - __label__ = "UV Texture" + bl_label = "UV Texture" def draw(self, context): layout = self.layout @@ -212,7 +212,7 @@ class DATA_PT_uv_texture(DataButtonsPanel): layout.itemR(lay, "name") class DATA_PT_vertex_colors(DataButtonsPanel): - __label__ = "Vertex Colors" + bl_label = "Vertex Colors" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_metaball.py b/release/scripts/ui/buttons_data_metaball.py index 757546fdf8a..bf937f212d9 100644 --- a/release/scripts/ui/buttons_data_metaball.py +++ b/release/scripts/ui/buttons_data_metaball.py @@ -1,15 +1,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return context.meta_ball class DATA_PT_context_metaball(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -28,7 +28,7 @@ class DATA_PT_context_metaball(DataButtonsPanel): split.itemS() class DATA_PT_metaball(DataButtonsPanel): - __label__ = "Metaball" + bl_label = "Metaball" def draw(self, context): layout = self.layout @@ -51,7 +51,7 @@ class DATA_PT_metaball(DataButtonsPanel): layout.itemR(mball, "flag", expand=True) class DATA_PT_metaball_element(DataButtonsPanel): - __label__ = "Active Element" + bl_label = "Active Element" def poll(self, context): return (context.meta_ball and context.meta_ball.active_element) diff --git a/release/scripts/ui/buttons_data_modifier.py b/release/scripts/ui/buttons_data_modifier.py index 754e8ce106e..7a49e84e906 100644 --- a/release/scripts/ui/buttons_data_modifier.py +++ b/release/scripts/ui/buttons_data_modifier.py @@ -2,12 +2,12 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "modifier" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "modifier" class DATA_PT_modifiers(DataButtonsPanel): - __label__ = "Modifiers" + bl_label = "Modifiers" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_data_text.py b/release/scripts/ui/buttons_data_text.py index 0d46d5f8a0d..9b8e1e4d984 100644 --- a/release/scripts/ui/buttons_data_text.py +++ b/release/scripts/ui/buttons_data_text.py @@ -2,15 +2,15 @@ import bpy class DataButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "data" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "data" def poll(self, context): return (context.object and context.object.type == 'TEXT' and context.curve) class DATA_PT_context_text(DataButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -29,7 +29,7 @@ class DATA_PT_context_text(DataButtonsPanel): split.itemS() class DATA_PT_shape_text(DataButtonsPanel): - __label__ = "Shape Text" + bl_label = "Shape Text" def draw(self, context): layout = self.layout @@ -63,7 +63,7 @@ class DATA_PT_shape_text(DataButtonsPanel): col.itemR(curve, "fast", text="Fast Editing") class DATA_PT_geometry_text(DataButtonsPanel): - __label__ = "Geometry" + bl_label = "Geometry" def draw(self, context): layout = self.layout @@ -87,7 +87,7 @@ class DATA_PT_geometry_text(DataButtonsPanel): col.itemR(curve, "bevel_object", text="") class DATA_PT_font(DataButtonsPanel): - __label__ = "Font" + bl_label = "Font" def draw(self, context): layout = self.layout @@ -127,7 +127,7 @@ class DATA_PT_font(DataButtonsPanel): col.itemR(text, "ul_height", text="Thickness") class DATA_PT_paragraph(DataButtonsPanel): - __label__ = "Paragraph" + bl_label = "Paragraph" def draw(self, context): layout = self.layout @@ -151,7 +151,7 @@ class DATA_PT_paragraph(DataButtonsPanel): col.itemR(text, "offset_y", text="Y") class DATA_PT_textboxes(DataButtonsPanel): - __label__ = "Text Boxes" + bl_label = "Text Boxes" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_game.py b/release/scripts/ui/buttons_game.py index bf25289333f..2a1e6adee5b 100644 --- a/release/scripts/ui/buttons_game.py +++ b/release/scripts/ui/buttons_game.py @@ -2,9 +2,9 @@ import bpy class PhysicsButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "physics" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "physics" def poll(self, context): ob = context.active_object @@ -12,7 +12,7 @@ class PhysicsButtonsPanel(bpy.types.Panel): return ob and ob.game and (rd.engine == 'BLENDER_GAME') class PHYSICS_PT_game_physics(PhysicsButtonsPanel): - __label__ = "Physics" + bl_label = "Physics" def draw(self, context): layout = self.layout @@ -131,7 +131,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): layout.itemR(ob, "restrict_render", text="Invisible") class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel): - __label__ = "Collision Bounds" + bl_label = "Collision Bounds" def poll(self, context): game = context.object.game @@ -159,16 +159,16 @@ bpy.types.register(PHYSICS_PT_game_physics) bpy.types.register(PHYSICS_PT_game_collision_bounds) class RenderButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "render" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "render" def poll(self, context): rd = context.scene.render_data return (rd.engine == 'BLENDER_GAME') class RENDER_PT_game(RenderButtonsPanel): - __label__ = "Game" + bl_label = "Game" def draw(self, context): layout = self.layout @@ -178,7 +178,7 @@ class RENDER_PT_game(RenderButtonsPanel): row.itemL() class RENDER_PT_game_player(RenderButtonsPanel): - __label__ = "Standalone Player" + bl_label = "Standalone Player" def draw(self, context): layout = self.layout @@ -209,7 +209,7 @@ class RENDER_PT_game_player(RenderButtonsPanel): col.itemR(gs, "framing_color", text="") class RENDER_PT_game_stereo(RenderButtonsPanel): - __label__ = "Stereo" + bl_label = "Stereo" def draw(self, context): layout = self.layout @@ -258,7 +258,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel): layout.itemR(gs, "dome_text") class RENDER_PT_game_shading(RenderButtonsPanel): - __label__ = "Shading" + bl_label = "Shading" def draw(self, context): layout = self.layout @@ -280,7 +280,7 @@ class RENDER_PT_game_shading(RenderButtonsPanel): col.itemR(gs, "glsl_extra_textures", text="Extra Textures") class RENDER_PT_game_performance(RenderButtonsPanel): - __label__ = "Performance" + bl_label = "Performance" def draw(self, context): layout = self.layout @@ -302,7 +302,7 @@ class RENDER_PT_game_performance(RenderButtonsPanel): col.itemR(gs, "display_lists") class RENDER_PT_game_sound(RenderButtonsPanel): - __label__ = "Sound" + bl_label = "Sound" def draw(self, context): layout = self.layout @@ -321,16 +321,16 @@ bpy.types.register(RENDER_PT_game_performance) bpy.types.register(RENDER_PT_game_sound) class WorldButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "world" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "world" def poll(self, context): rd = context.scene.render_data return (rd.engine == 'BLENDER_GAME') class WORLD_PT_game_context_world(WorldButtonsPanel): - __show_header__ = False + bl_show_header = False def poll(self, context): rd = context.scene.render_data @@ -351,7 +351,7 @@ class WORLD_PT_game_context_world(WorldButtonsPanel): split.template_ID(space, "pin_id") class WORLD_PT_game_world(WorldButtonsPanel): - __label__ = "World" + bl_label = "World" def draw(self, context): layout = self.layout @@ -370,7 +370,7 @@ class WORLD_PT_game_world(WorldButtonsPanel): row.itemR(world.mist, "depth") class WORLD_PT_game_physics(WorldButtonsPanel): - __label__ = "Physics" + bl_label = "Physics" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_material.py b/release/scripts/ui/buttons_material.py index 4ba3577a092..c83f4a65209 100644 --- a/release/scripts/ui/buttons_material.py +++ b/release/scripts/ui/buttons_material.py @@ -14,9 +14,9 @@ def active_node_mat(mat): return None class MaterialButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "material" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "material" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): @@ -25,14 +25,14 @@ class MaterialButtonsPanel(bpy.types.Panel): return mat and (engine in self.COMPAT_ENGINES) class MATERIAL_PT_preview(MaterialButtonsPanel): - __label__ = "Preview" + bl_label = "Preview" COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def draw(self, context): self.layout.template_preview(context.material) class MATERIAL_PT_context_material(MaterialButtonsPanel): - __show_header__ = False + bl_show_header = False COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): @@ -83,7 +83,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel): layout.itemR(mat, "type", expand=True) class MATERIAL_PT_shading(MaterialButtonsPanel): - __label__ = "Shading" + bl_label = "Shading" COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): @@ -118,8 +118,8 @@ class MATERIAL_PT_shading(MaterialButtonsPanel): layout.itemR(mat, "alpha") class MATERIAL_PT_strand(MaterialButtonsPanel): - __label__ = "Strand" - __default_closed__ = True + bl_label = "Strand" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -161,7 +161,7 @@ class MATERIAL_PT_strand(MaterialButtonsPanel): sub.itemR(tan, "blend_distance", text="Distance") class MATERIAL_PT_physics(MaterialButtonsPanel): - __label__ = "Physics" + bl_label = "Physics" COMPAT_ENGINES = set(['BLENDER_GAME']) def draw(self, context): @@ -182,7 +182,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel): col.itemR(phys, "damp", slider=True) class MATERIAL_PT_options(MaterialButtonsPanel): - __label__ = "Options" + bl_label = "Options" COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): @@ -224,8 +224,8 @@ class MATERIAL_PT_options(MaterialButtonsPanel): col.itemR(mat, "object_color") class MATERIAL_PT_shadow(MaterialButtonsPanel): - __label__ = "Shadow" - __default_closed__ = True + bl_label = "Shadow" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): @@ -258,7 +258,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel): sub.itemR(mat, "shadow_ray_bias", text="Ray Bias") class MATERIAL_PT_diffuse(MaterialButtonsPanel): - __label__ = "Diffuse" + bl_label = "Diffuse" COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): @@ -314,7 +314,7 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel): row.itemR(mat, "diffuse_ramp_factor", text="Factor") class MATERIAL_PT_specular(MaterialButtonsPanel): - __label__ = "Specular" + bl_label = "Specular" COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): @@ -368,8 +368,8 @@ class MATERIAL_PT_specular(MaterialButtonsPanel): row.itemR(mat, "specular_ramp_factor", text="Factor") class MATERIAL_PT_sss(MaterialButtonsPanel): - __label__ = "Subsurface Scattering" - __default_closed__ = True + bl_label = "Subsurface Scattering" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -413,8 +413,8 @@ class MATERIAL_PT_sss(MaterialButtonsPanel): col.itemR(sss, "error_tolerance", text="Error") class MATERIAL_PT_mirror(MaterialButtonsPanel): - __label__ = "Mirror" - __default_closed__ = True + bl_label = "Mirror" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -468,8 +468,8 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel): sub.itemR(raym, "gloss_anisotropic", text="Anisotropic") class MATERIAL_PT_transp(MaterialButtonsPanel): - __label__= "Transparency" - __default_closed__ = True + bl_label= "Transparency" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -528,7 +528,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel): sub.itemR(rayt, "gloss_samples", text="Samples") class MATERIAL_PT_halo(MaterialButtonsPanel): - __label__= "Halo" + bl_label= "Halo" COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -575,7 +575,7 @@ class MATERIAL_PT_halo(MaterialButtonsPanel): sub.itemR(halo, "star_tips") class MATERIAL_PT_flare(MaterialButtonsPanel): - __label__= "Flare" + bl_label= "Flare" COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -623,9 +623,9 @@ bpy.types.register(MATERIAL_PT_shadow) # Volumetrics class VolumeButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "material" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "material" def poll(self, context): mat = context.material @@ -633,8 +633,8 @@ class VolumeButtonsPanel(bpy.types.Panel): return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES) class MATERIAL_PT_volume_density(VolumeButtonsPanel): - __label__ = "Density" - __default_closed__ = False + bl_label = "Density" + bl_default_closed = False COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -648,8 +648,8 @@ class MATERIAL_PT_volume_density(VolumeButtonsPanel): row.itemR(vol, "density_scale") class MATERIAL_PT_volume_shading(VolumeButtonsPanel): - __label__ = "Shading" - __default_closed__ = False + bl_label = "Shading" + bl_default_closed = False COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -673,8 +673,8 @@ class MATERIAL_PT_volume_shading(VolumeButtonsPanel): sub.itemR(vol, "reflection_color", text="") class MATERIAL_PT_volume_lighting(VolumeButtonsPanel): - __label__ = "Lighting" - __default_closed__ = False + bl_label = "Lighting" + bl_default_closed = False COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -708,7 +708,7 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel): sub.itemR(vol, "ms_intensity") class MATERIAL_PT_volume_transp(VolumeButtonsPanel): - __label__= "Transparency" + bl_label= "Transparency" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -719,8 +719,8 @@ class MATERIAL_PT_volume_transp(VolumeButtonsPanel): layout.itemR(mat, "transparency_method", expand=True) class MATERIAL_PT_volume_integration(VolumeButtonsPanel): - __label__ = "Integration" - __default_closed__ = False + bl_label = "Integration" + bl_default_closed = False COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): diff --git a/release/scripts/ui/buttons_object.py b/release/scripts/ui/buttons_object.py index 78aa52a647e..37ecf83d846 100644 --- a/release/scripts/ui/buttons_object.py +++ b/release/scripts/ui/buttons_object.py @@ -2,12 +2,12 @@ import bpy class ObjectButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "object" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "object" class OBJECT_PT_context_object(ObjectButtonsPanel): - __show_header__ = False + bl_show_header = False def draw(self, context): layout = self.layout @@ -19,7 +19,7 @@ class OBJECT_PT_context_object(ObjectButtonsPanel): row.itemR(ob, "name", text="") class OBJECT_PT_transform(ObjectButtonsPanel): - __label__ = "Transform" + bl_label = "Transform" def draw(self, context): layout = self.layout @@ -44,8 +44,8 @@ class OBJECT_PT_transform(ObjectButtonsPanel): layout.itemR(ob, "rotation_mode") class OBJECT_PT_transform_locks(ObjectButtonsPanel): - __label__ = "Transform Locks" - __default_closed__ = True + bl_label = "Transform Locks" + bl_default_closed = True def draw(self, context): layout = self.layout @@ -69,7 +69,7 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel): row.column().itemR(ob, "lock_scale") class OBJECT_PT_relations(ObjectButtonsPanel): - __label__ = "Relations" + bl_label = "Relations" def draw(self, context): layout = self.layout @@ -97,7 +97,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel): sub.active = parent != None class OBJECT_PT_groups(ObjectButtonsPanel): - __label__ = "Groups" + bl_label = "Groups" def draw(self, context): layout = self.layout @@ -123,7 +123,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel): split.column().itemR(group, "dupli_offset", text="") class OBJECT_PT_display(ObjectButtonsPanel): - __label__ = "Display" + bl_label = "Display" def draw(self, context): layout = self.layout @@ -149,7 +149,7 @@ class OBJECT_PT_display(ObjectButtonsPanel): flow.itemR(ob, "draw_transparent", text="Transparency") class OBJECT_PT_duplication(ObjectButtonsPanel): - __label__ = "Duplication" + bl_label = "Duplication" def draw(self, context): layout = self.layout @@ -183,7 +183,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel): layout.itemR(ob, "dupli_group", text="Group") class OBJECT_PT_animation(ObjectButtonsPanel): - __label__ = "Animation" + bl_label = "Animation" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_object_constraint.py b/release/scripts/ui/buttons_object_constraint.py index 07ea5f43907..40fc4f7343d 100644 --- a/release/scripts/ui/buttons_object_constraint.py +++ b/release/scripts/ui/buttons_object_constraint.py @@ -2,9 +2,9 @@ import bpy class ConstraintButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "constraint" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "constraint" def draw_constraint(self, context, con): layout = self.layout @@ -577,8 +577,8 @@ class ConstraintButtonsPanel(bpy.types.Panel): row.itemR(con, "track", expand=True) class OBJECT_PT_constraints(ConstraintButtonsPanel): - __label__ = "Constraints" - __context__ = "constraint" + bl_label = "Constraints" + bl_context = "constraint" def poll(self, context): return (context.object) @@ -595,9 +595,9 @@ class OBJECT_PT_constraints(ConstraintButtonsPanel): self.draw_constraint(context, con) class BONE_PT_inverse_kinematics(ConstraintButtonsPanel): - __label__ = "Inverse Kinematics" - __default_closed__ = True - __context__ = "bone_constraint" + bl_label = "Inverse Kinematics" + bl_default_closed = True + bl_context = "bone_constraint" def poll(self, context): ob = context.object @@ -677,9 +677,9 @@ class BONE_PT_inverse_kinematics(ConstraintButtonsPanel): #row.itemR(pchan, "ik_lin_weight", text="Weight", slider=True) class BONE_PT_iksolver_itasc(ConstraintButtonsPanel): - __label__ = "iTaSC parameters" - __default_closed__ = True - __context__ = "bone_constraint" + bl_label = "iTaSC parameters" + bl_default_closed = True + bl_context = "bone_constraint" def poll(self, context): ob = context.object @@ -727,8 +727,8 @@ class BONE_PT_iksolver_itasc(ConstraintButtonsPanel): row.itemR(itasc, "dampeps", text="Eps", slider=True) class BONE_PT_constraints(ConstraintButtonsPanel): - __label__ = "Constraints" - __context__ = "bone_constraint" + bl_label = "Constraints" + bl_context = "bone_constraint" def poll(self, context): ob = context.object diff --git a/release/scripts/ui/buttons_particle.py b/release/scripts/ui/buttons_particle.py index 4054fbf8780..8ab31df7543 100644 --- a/release/scripts/ui/buttons_particle.py +++ b/release/scripts/ui/buttons_particle.py @@ -16,15 +16,15 @@ def particle_panel_poll(context): return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR') class ParticleButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "particle" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "particle" def poll(self, context): return particle_panel_poll(context) class PARTICLE_PT_particles(ParticleButtonsPanel): - __show_header__ = False + bl_show_header = False def poll(self, context): return (context.particle_system or context.object) @@ -105,7 +105,7 @@ class PARTICLE_PT_particles(ParticleButtonsPanel): split.itemR(psys, "reactor_target_particle_system", text="Particle System") class PARTICLE_PT_emission(ParticleButtonsPanel): - __label__ = "Emission" + bl_label = "Emission" def poll(self, context): if particle_panel_poll(context): @@ -158,8 +158,8 @@ class PARTICLE_PT_emission(ParticleButtonsPanel): row.itemR(part, "grid_resolution") class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel): - __label__ = "Hair dynamics" - __default_closed__ = True + bl_label = "Hair dynamics" + bl_default_closed = True def poll(self, context): psys = context.particle_system @@ -205,8 +205,8 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel): col.itemR(cloth, "quality", text="Steps",slider=True) class PARTICLE_PT_cache(ParticleButtonsPanel): - __label__ = "Cache" - __default_closed__ = True + bl_label = "Cache" + bl_default_closed = True def poll(self, context): psys = context.particle_system @@ -225,7 +225,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel): point_cache_ui(self, psys.point_cache, particle_panel_enabled(context, psys), not psys.hair_dynamics, 0) class PARTICLE_PT_velocity(ParticleButtonsPanel): - __label__ = "Velocity" + bl_label = "Velocity" def poll(self, context): if particle_panel_poll(context): @@ -270,7 +270,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel): # sub.itemR(part, "reaction_shape", slider=True) class PARTICLE_PT_rotation(ParticleButtonsPanel): - __label__ = "Rotation" + bl_label = "Rotation" def poll(self, context): if particle_panel_poll(context): @@ -309,7 +309,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel): sub.itemR(part, "angular_velocity_factor", text="") class PARTICLE_PT_physics(ParticleButtonsPanel): - __label__ = "Physics" + bl_label = "Physics" def poll(self, context): if particle_panel_poll(context): @@ -449,7 +449,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel): layout.itemR(key, "mode", expand=True) class PARTICLE_PT_boidbrain(ParticleButtonsPanel): - __label__ = "Boid Brain" + bl_label = "Boid Brain" def poll(self, context): psys = context.particle_system @@ -543,7 +543,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel): row.itemR(rule, "flee_distance") class PARTICLE_PT_render(ParticleButtonsPanel): - __label__ = "Render" + bl_label = "Render" def poll(self, context): psys = context.particle_system @@ -706,8 +706,8 @@ class PARTICLE_PT_render(ParticleButtonsPanel): col.itemL(text="") class PARTICLE_PT_draw(ParticleButtonsPanel): - __label__ = "Display" - __default_closed__ = True + bl_label = "Display" + bl_default_closed = True def poll(self, context): psys = context.particle_system @@ -761,8 +761,8 @@ class PARTICLE_PT_draw(ParticleButtonsPanel): #subcol.itemL(text="Override material color") class PARTICLE_PT_children(ParticleButtonsPanel): - __label__ = "Children" - __default_closed__ = True + bl_label = "Children" + bl_default_closed = True def draw(self, context): layout = self.layout @@ -837,8 +837,8 @@ class PARTICLE_PT_children(ParticleButtonsPanel): sub.itemR(part, "kink_shape", slider=True) class PARTICLE_PT_field_weights(ParticleButtonsPanel): - __label__ = "Field Weights" - __default_closed__ = True + bl_label = "Field Weights" + bl_default_closed = True def draw(self, context): part = context.particle_system.settings @@ -848,8 +848,8 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel): self.layout.itemR(part.effector_weights, "do_growing_hair") class PARTICLE_PT_force_fields(ParticleButtonsPanel): - __label__ = "Force Field Settings" - __default_closed__ = True + bl_label = "Force Field Settings" + bl_default_closed = True def draw(self, context): layout = self.layout @@ -874,8 +874,8 @@ class PARTICLE_PT_force_fields(ParticleButtonsPanel): basic_force_field_falloff_ui(self, part.force_field_2) class PARTICLE_PT_vertexgroups(ParticleButtonsPanel): - __label__ = "Vertexgroups" - __default_closed__ = True + bl_label = "Vertexgroups" + bl_default_closed = True def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/buttons_physics_cloth.py b/release/scripts/ui/buttons_physics_cloth.py index bcf1d3b8316..3a40713adb8 100644 --- a/release/scripts/ui/buttons_physics_cloth.py +++ b/release/scripts/ui/buttons_physics_cloth.py @@ -8,9 +8,9 @@ def cloth_panel_enabled(md): return md.point_cache.baked==False class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "physics" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "physics" def poll(self, context): ob = context.object @@ -18,7 +18,7 @@ class PhysicButtonsPanel(bpy.types.Panel): return (ob and ob.type == 'MESH') and (not rd.use_game_engine) class PHYSICS_PT_cloth(PhysicButtonsPanel): - __label__ = "Cloth" + bl_label = "Cloth" def draw(self, context): layout = self.layout @@ -88,8 +88,8 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel): """ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel): - __label__ = "Cloth Cache" - __default_closed__ = True + bl_label = "Cloth Cache" + bl_default_closed = True def poll(self, context): return context.cloth @@ -99,8 +99,8 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel): point_cache_ui(self, md.point_cache, cloth_panel_enabled(md), 0, 0) class PHYSICS_PT_cloth_collision(PhysicButtonsPanel): - __label__ = "Cloth Collision" - __default_closed__ = True + bl_label = "Cloth Collision" + bl_default_closed = True def poll(self, context): return context.cloth @@ -134,8 +134,8 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel): sub.itemR(cloth, "self_min_distance", slider=True, text="Distance") class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel): - __label__ = "Cloth Stiffness Scaling" - __default_closed__ = True + bl_label = "Cloth Stiffness Scaling" + bl_default_closed = True def poll(self, context): return context.cloth @@ -170,8 +170,8 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel): sub.item_pointerR(cloth, "bending_vertex_group", ob, "vertex_groups", text="") class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel): - __label__ = "Cloth Field Weights" - __default_closed__ = True + bl_label = "Cloth Field Weights" + bl_default_closed = True def poll(self, context): return (context.cloth) diff --git a/release/scripts/ui/buttons_physics_field.py b/release/scripts/ui/buttons_physics_field.py index ac713bb5e67..6d8864560c7 100644 --- a/release/scripts/ui/buttons_physics_field.py +++ b/release/scripts/ui/buttons_physics_field.py @@ -5,16 +5,16 @@ from buttons_physics_common import basic_force_field_settings_ui from buttons_physics_common import basic_force_field_falloff_ui class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "physics" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "physics" def poll(self, context): rd = context.scene.render_data return (context.object) and (not rd.use_game_engine) class PHYSICS_PT_field(PhysicButtonsPanel): - __label__ = "Force Fields" + bl_label = "Force Fields" def draw(self, context): layout = self.layout @@ -130,8 +130,8 @@ class PHYSICS_PT_field(PhysicButtonsPanel): sub.itemR(field, "radial_maximum", text="Distance") class PHYSICS_PT_collision(PhysicButtonsPanel): - __label__ = "Collision" - #__default_closed__ = True + bl_label = "Collision" + #bl_default_closed = True def poll(self, context): ob = context.object diff --git a/release/scripts/ui/buttons_physics_fluid.py b/release/scripts/ui/buttons_physics_fluid.py index e178a831ddd..047c2e17db9 100644 --- a/release/scripts/ui/buttons_physics_fluid.py +++ b/release/scripts/ui/buttons_physics_fluid.py @@ -2,9 +2,9 @@ import bpy class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "physics" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "physics" def poll(self, context): ob = context.object @@ -12,7 +12,7 @@ class PhysicButtonsPanel(bpy.types.Panel): return (ob and ob.type == 'MESH') and (not rd.use_game_engine) class PHYSICS_PT_fluid(PhysicButtonsPanel): - __label__ = "Fluid" + bl_label = "Fluid" def draw(self, context): layout = self.layout @@ -169,8 +169,8 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel): sub.itemR(fluid, "velocity_radius", text="Radius") class PHYSICS_PT_domain_gravity(PhysicButtonsPanel): - __label__ = "Domain World" - __default_closed__ = True + bl_label = "Domain World" + bl_default_closed = True def poll(self, context): md = context.fluid @@ -207,8 +207,8 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel): sub.itemR(fluid, "compressibility", slider=True) class PHYSICS_PT_domain_boundary(PhysicButtonsPanel): - __label__ = "Domain Boundary" - __default_closed__ = True + bl_label = "Domain Boundary" + bl_default_closed = True def poll(self, context): md = context.fluid @@ -235,8 +235,8 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel): sub.itemR(fluid, "surface_subdivisions", text="Subdivisions") class PHYSICS_PT_domain_particles(PhysicButtonsPanel): - __label__ = "Domain Particles" - __default_closed__ = True + bl_label = "Domain Particles" + bl_default_closed = True def poll(self, context): md = context.fluid diff --git a/release/scripts/ui/buttons_physics_smoke.py b/release/scripts/ui/buttons_physics_smoke.py index b1523148a30..dd728fcc876 100644 --- a/release/scripts/ui/buttons_physics_smoke.py +++ b/release/scripts/ui/buttons_physics_smoke.py @@ -5,9 +5,9 @@ from buttons_physics_common import point_cache_ui from buttons_physics_common import effector_weights_ui class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "physics" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "physics" def poll(self, context): ob = context.object @@ -15,7 +15,7 @@ class PhysicButtonsPanel(bpy.types.Panel): return (ob and ob.type == 'MESH') and (not rd.use_game_engine) class PHYSICS_PT_smoke(PhysicButtonsPanel): - __label__ = "Smoke" + bl_label = "Smoke" def draw(self, context): layout = self.layout @@ -86,8 +86,8 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel): # layout.itemS() class PHYSICS_PT_smoke_groups(PhysicButtonsPanel): - __label__ = "Smoke Groups" - __default_closed__ = True + bl_label = "Smoke Groups" + bl_default_closed = True def poll(self, context): md = context.smoke @@ -112,8 +112,8 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel): col.itemR(group, "coll_group", text="") class PHYSICS_PT_smoke_cache(PhysicButtonsPanel): - __label__ = "Smoke Cache" - __default_closed__ = True + bl_label = "Smoke Cache" + bl_default_closed = True def poll(self, context): md = context.smoke @@ -128,8 +128,8 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel): point_cache_ui(self, cache, cache.baked==False, 0, 1) class PHYSICS_PT_smoke_highres(PhysicButtonsPanel): - __label__ = "Smoke High Resolution" - __default_closed__ = True + bl_label = "Smoke High Resolution" + bl_default_closed = True def poll(self, context): md = context.smoke @@ -158,8 +158,8 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel): col.itemR(md, "viewhighres") class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel): - __label__ = "Smoke High Resolution Cache" - __default_closed__ = True + bl_label = "Smoke High Resolution Cache" + bl_default_closed = True def poll(self, context): md = context.smoke @@ -174,8 +174,8 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel): point_cache_ui(self, cache, cache.baked==False, 0, 1) class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel): - __label__ = "Smoke Field Weights" - __default_closed__ = True + bl_label = "Smoke Field Weights" + bl_default_closed = True def poll(self, context): smoke = context.smoke diff --git a/release/scripts/ui/buttons_physics_softbody.py b/release/scripts/ui/buttons_physics_softbody.py index cd66df00044..41c061b85c1 100644 --- a/release/scripts/ui/buttons_physics_softbody.py +++ b/release/scripts/ui/buttons_physics_softbody.py @@ -8,9 +8,9 @@ def softbody_panel_enabled(md): return md.point_cache.baked==False class PhysicButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "physics" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "physics" def poll(self, context): ob = context.object @@ -18,7 +18,7 @@ class PhysicButtonsPanel(bpy.types.Panel): return (ob and ob.type == 'MESH') and (not rd.use_game_engine) class PHYSICS_PT_softbody(PhysicButtonsPanel): - __label__ = "Soft Body" + bl_label = "Soft Body" def draw(self, context): layout = self.layout @@ -59,8 +59,8 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel): col.itemR(softbody, "speed") class PHYSICS_PT_softbody_cache(PhysicButtonsPanel): - __label__ = "Soft Body Cache" - __default_closed__ = True + bl_label = "Soft Body Cache" + bl_default_closed = True def poll(self, context): return context.soft_body @@ -70,8 +70,8 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel): point_cache_ui(self, md.point_cache, softbody_panel_enabled(md), 0, 0) class PHYSICS_PT_softbody_goal(PhysicButtonsPanel): - __label__ = "Soft Body Goal" - __default_closed__ = True + bl_label = "Soft Body Goal" + bl_default_closed = True def poll(self, context): return context.soft_body @@ -111,8 +111,8 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel): layout.item_pointerR(softbody, "goal_vertex_group", ob, "vertex_groups", text="Vertex Group") class PHYSICS_PT_softbody_edge(PhysicButtonsPanel): - __label__ = "Soft Body Edges" - __default_closed__ = True + bl_label = "Soft Body Edges" + bl_default_closed = True def poll(self, context): return context.soft_body @@ -159,8 +159,8 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel): col.itemR(softbody, "face_collision", text="Face") class PHYSICS_PT_softbody_collision(PhysicButtonsPanel): - __label__ = "Soft Body Collision" - __default_closed__ = True + bl_label = "Soft Body Collision" + bl_default_closed = True def poll(self, context): return context.soft_body @@ -190,8 +190,8 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel): col.itemR(softbody, "ball_damp", text="Dampening") class PHYSICS_PT_softbody_solver(PhysicButtonsPanel): - __label__ = "Soft Body Solver" - __default_closed__ = True + bl_label = "Soft Body Solver" + bl_default_closed = True def poll(self, context): return context.soft_body @@ -224,8 +224,8 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel): layout.itemR(softbody, "diagnose") class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel): - __label__ = "Soft Body Field Weights" - __default_closed__ = True + bl_label = "Soft Body Field Weights" + bl_default_closed = True def poll(self, context): return (context.soft_body) diff --git a/release/scripts/ui/buttons_render.py b/release/scripts/ui/buttons_render.py index 0826c766ce3..f20546a5c4d 100644 --- a/release/scripts/ui/buttons_render.py +++ b/release/scripts/ui/buttons_render.py @@ -2,9 +2,9 @@ import bpy class RenderButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "render" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "render" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): @@ -12,7 +12,7 @@ class RenderButtonsPanel(bpy.types.Panel): return (context.scene and rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES) class RENDER_PT_render(RenderButtonsPanel): - __label__ = "Render" + bl_label = "Render" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -27,8 +27,8 @@ class RENDER_PT_render(RenderButtonsPanel): layout.itemR(rd, "display_mode", text="Display") class RENDER_PT_layers(RenderButtonsPanel): - __label__ = "Layers" - __default_closed__ = True + bl_label = "Layers" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -121,7 +121,7 @@ class RENDER_PT_layers(RenderButtonsPanel): row.itemR(rl, "pass_refraction_exclude", text="", icon='ICON_X') class RENDER_PT_shading(RenderButtonsPanel): - __label__ = "Shading" + bl_label = "Shading" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -143,8 +143,8 @@ class RENDER_PT_shading(RenderButtonsPanel): col.itemR(rd, "alpha_mode", text="Alpha") class RENDER_PT_performance(RenderButtonsPanel): - __label__ = "Performance" - __default_closed__ = True + bl_label = "Performance" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -183,8 +183,8 @@ class RENDER_PT_performance(RenderButtonsPanel): sub.itemR(rd, "use_local_coords", text="Local Coordinates") class RENDER_PT_post_processing(RenderButtonsPanel): - __label__ = "Post Processing" - __default_closed__ = True + bl_label = "Post Processing" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -220,7 +220,7 @@ class RENDER_PT_post_processing(RenderButtonsPanel): sub.itemR(rd, "edge_color", text="") class RENDER_PT_output(RenderButtonsPanel): - __label__ = "Output" + bl_label = "Output" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -284,8 +284,8 @@ class RENDER_PT_output(RenderButtonsPanel): split.itemR(rd, "tiff_bit") class RENDER_PT_encoding(RenderButtonsPanel): - __label__ = "Encoding" - __default_closed__ = True + bl_label = "Encoding" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -336,7 +336,7 @@ class RENDER_PT_encoding(RenderButtonsPanel): col.itemR(rd, "ffmpeg_audio_volume") class RENDER_PT_antialiasing(RenderButtonsPanel): - __label__ = "Anti-Aliasing" + bl_label = "Anti-Aliasing" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw_header(self, context): @@ -362,7 +362,7 @@ class RENDER_PT_antialiasing(RenderButtonsPanel): col.itemR(rd, "filter_size", text="Size", slider=True) class RENDER_PT_dimensions(RenderButtonsPanel): - __label__ = "Dimensions" + bl_label = "Dimensions" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -401,8 +401,8 @@ class RENDER_PT_dimensions(RenderButtonsPanel): col.itemR(rd, "fps_base",text="/") class RENDER_PT_stamp(RenderButtonsPanel): - __label__ = "Stamp" - __default_closed__ = True + bl_label = "Stamp" + bl_default_closed = True COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw_header(self, context): diff --git a/release/scripts/ui/buttons_scene.py b/release/scripts/ui/buttons_scene.py index 54f47791d59..800644ef4ab 100644 --- a/release/scripts/ui/buttons_scene.py +++ b/release/scripts/ui/buttons_scene.py @@ -2,15 +2,15 @@ import bpy class SceneButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "scene" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "scene" def poll(self, context): return context.scene class SCENE_PT_scene(SceneButtonsPanel): - __label__ = "Scene" + bl_label = "Scene" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -22,7 +22,7 @@ class SCENE_PT_scene(SceneButtonsPanel): layout.itemR(scene, "set", text="Background") class SCENE_PT_unit(SceneButtonsPanel): - __label__ = "Units" + bl_label = "Units" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -39,7 +39,7 @@ class SCENE_PT_unit(SceneButtonsPanel): row.itemR(unit, "use_separate") class SCENE_PT_keying_sets(SceneButtonsPanel): - __label__ = "Keying Sets" + bl_label = "Keying Sets" def draw(self, context): layout = self.layout @@ -69,7 +69,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel): col.itemR(ks, "insertkey_visual", text="Visual") class SCENE_PT_keying_set_paths(SceneButtonsPanel): - __label__ = "Active Keying Set" + bl_label = "Active Keying Set" def poll(self, context): return (context.scene != None) and (context.scene.active_keying_set != None) @@ -115,7 +115,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel): col.itemR(ksp, "group") class SCENE_PT_physics(SceneButtonsPanel): - __label__ = "Gravity" + bl_label = "Gravity" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw_header(self, context): diff --git a/release/scripts/ui/buttons_texture.py b/release/scripts/ui/buttons_texture.py index 1a308bbb2ad..cb5bca9e26a 100644 --- a/release/scripts/ui/buttons_texture.py +++ b/release/scripts/ui/buttons_texture.py @@ -26,16 +26,16 @@ def context_tex_datablock(context): return idblock class TextureButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "texture" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "texture" def poll(self, context): tex = context.texture return (tex and (tex.type != 'NONE' or tex.use_nodes)) class TEXTURE_PT_preview(TextureButtonsPanel): - __label__ = "Preview" + bl_label = "Preview" def draw(self, context): layout = self.layout @@ -51,7 +51,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel): layout.template_preview(tex, slot=slot) class TEXTURE_PT_context_texture(TextureButtonsPanel): - __show_header__ = False + bl_show_header = False def poll(self, context): return (context.material or context.world or context.lamp or context.brush or context.texture) @@ -107,8 +107,8 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel): split.itemR(tex, "type", text="") class TEXTURE_PT_colors(TextureButtonsPanel): - __label__ = "Colors" - __default_closed__ = True + bl_label = "Colors" + bl_default_closed = True def draw(self, context): layout = self.layout @@ -143,7 +143,7 @@ class TextureSlotPanel(TextureButtonsPanel): ) class TEXTURE_PT_mapping(TextureSlotPanel): - __label__ = "Mapping" + bl_label = "Mapping" def draw(self, context): layout = self.layout @@ -218,7 +218,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel): class TEXTURE_PT_influence(TextureSlotPanel): - __label__ = "Influence" + bl_label = "Influence" def poll(self, context): return context.texture_slot @@ -327,7 +327,7 @@ class TextureTypePanel(TextureButtonsPanel): return (tex and tex.type == self.tex_type and not tex.use_nodes) class TEXTURE_PT_clouds(TextureTypePanel): - __label__ = "Clouds" + bl_label = "Clouds" tex_type = 'CLOUDS' def draw(self, context): @@ -346,7 +346,7 @@ class TEXTURE_PT_clouds(TextureTypePanel): flow.itemR(tex, "nabla", text="Nabla") class TEXTURE_PT_wood(TextureTypePanel): - __label__ = "Wood" + bl_label = "Wood" tex_type = 'WOOD' def draw(self, context): @@ -370,7 +370,7 @@ class TEXTURE_PT_wood(TextureTypePanel): flow.itemR(tex, "nabla") class TEXTURE_PT_marble(TextureTypePanel): - __label__ = "Marble" + bl_label = "Marble" tex_type = 'MARBLE' def draw(self, context): @@ -391,7 +391,7 @@ class TEXTURE_PT_marble(TextureTypePanel): flow.itemR(tex, "nabla") class TEXTURE_PT_magic(TextureTypePanel): - __label__ = "Magic" + bl_label = "Magic" tex_type = 'MAGIC' def draw(self, context): @@ -404,7 +404,7 @@ class TEXTURE_PT_magic(TextureTypePanel): row.itemR(tex, "turbulence") class TEXTURE_PT_blend(TextureTypePanel): - __label__ = "Blend" + bl_label = "Blend" tex_type = 'BLEND' def draw(self, context): @@ -419,7 +419,7 @@ class TEXTURE_PT_blend(TextureTypePanel): sub.itemR(tex, "flip_axis", expand=True) class TEXTURE_PT_stucci(TextureTypePanel): - __label__ = "Stucci" + bl_label = "Stucci" tex_type = 'STUCCI' def draw(self, context): @@ -437,7 +437,7 @@ class TEXTURE_PT_stucci(TextureTypePanel): row.itemR(tex, "turbulence") class TEXTURE_PT_image(TextureTypePanel): - __label__ = "Image" + bl_label = "Image" tex_type = 'IMAGE' def draw(self, context): @@ -448,8 +448,8 @@ class TEXTURE_PT_image(TextureTypePanel): layout.template_image(tex, "image", tex.image_user) class TEXTURE_PT_image_sampling(TextureTypePanel): - __label__ = "Image Sampling" - __default_closed__ = True + bl_label = "Image Sampling" + bl_default_closed = True tex_type = 'IMAGE' def draw(self, context): @@ -491,8 +491,8 @@ class TEXTURE_PT_image_sampling(TextureTypePanel): col.itemR(tex, "filter_eccentricity", text="Eccentricity") class TEXTURE_PT_image_mapping(TextureTypePanel): - __label__ = "Image Mapping" - __default_closed__ = True + bl_label = "Image Mapping" + bl_default_closed = True tex_type = 'IMAGE' def draw(self, context): @@ -539,7 +539,7 @@ class TEXTURE_PT_image_mapping(TextureTypePanel): col.itemR(tex, "crop_max_y", text="Y") class TEXTURE_PT_plugin(TextureTypePanel): - __label__ = "Plugin" + bl_label = "Plugin" tex_type = 'PLUGIN' def draw(self, context): @@ -550,7 +550,7 @@ class TEXTURE_PT_plugin(TextureTypePanel): layout.itemL(text="Nothing yet") class TEXTURE_PT_envmap(TextureTypePanel): - __label__ = "Environment Map" + bl_label = "Environment Map" tex_type = 'ENVIRONMENT_MAP' def draw(self, context): @@ -561,7 +561,7 @@ class TEXTURE_PT_envmap(TextureTypePanel): layout.itemL(text="Nothing yet") class TEXTURE_PT_musgrave(TextureTypePanel): - __label__ = "Musgrave" + bl_label = "Musgrave" tex_type = 'MUSGRAVE' def draw(self, context): @@ -594,7 +594,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel): row.itemR(tex, "nabla") class TEXTURE_PT_voronoi(TextureTypePanel): - __label__ = "Voronoi" + bl_label = "Voronoi" tex_type = 'VORONOI' def draw(self, context): @@ -628,7 +628,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel): row.itemR(tex, "nabla") class TEXTURE_PT_distortednoise(TextureTypePanel): - __label__ = "Distorted Noise" + bl_label = "Distorted Noise" tex_type = 'DISTORTED_NOISE' def draw(self, context): @@ -645,7 +645,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel): flow.itemR(tex, "nabla") class TEXTURE_PT_voxeldata(TextureButtonsPanel): - __label__ = "Voxel Data" + bl_label = "Voxel Data" def poll(self, context): tex = context.texture @@ -675,7 +675,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel): layout.itemR(vd, "intensity") class TEXTURE_PT_pointdensity(TextureButtonsPanel): - __label__ = "Point Density" + bl_label = "Point Density" def poll(self, context): tex = context.texture @@ -727,7 +727,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel): col.itemR(pd, "falloff_softness") class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel): - __label__ = "Turbulence" + bl_label = "Turbulence" def poll(self, context): tex = context.texture diff --git a/release/scripts/ui/buttons_world.py b/release/scripts/ui/buttons_world.py index abf2a139c06..b0bb27518d4 100644 --- a/release/scripts/ui/buttons_world.py +++ b/release/scripts/ui/buttons_world.py @@ -2,9 +2,9 @@ import bpy class WorldButtonsPanel(bpy.types.Panel): - __space_type__ = 'PROPERTIES' - __region_type__ = 'WINDOW' - __context__ = "world" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "world" # COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here def poll(self, context): @@ -12,14 +12,14 @@ class WorldButtonsPanel(bpy.types.Panel): return (context.world) and (not rd.use_game_engine) and (rd.engine in self.COMPAT_ENGINES) class WORLD_PT_preview(WorldButtonsPanel): - __label__ = "Preview" + bl_label = "Preview" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): self.layout.template_preview(context.world) class WORLD_PT_context_world(WorldButtonsPanel): - __show_header__ = False + bl_show_header = False COMPAT_ENGINES = set(['BLENDER_RENDER']) def poll(self, context): @@ -41,7 +41,7 @@ class WORLD_PT_context_world(WorldButtonsPanel): split.template_ID(space, "pin_id") class WORLD_PT_world(WorldButtonsPanel): - __label__ = "World" + bl_label = "World" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw(self, context): @@ -62,7 +62,7 @@ class WORLD_PT_world(WorldButtonsPanel): row.column().itemR(world, "ambient_color") class WORLD_PT_mist(WorldButtonsPanel): - __label__ = "Mist" + bl_label = "Mist" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw_header(self, context): @@ -86,7 +86,7 @@ class WORLD_PT_mist(WorldButtonsPanel): layout.itemR(world.mist, "falloff") class WORLD_PT_stars(WorldButtonsPanel): - __label__ = "Stars" + bl_label = "Stars" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw_header(self, context): @@ -108,7 +108,7 @@ class WORLD_PT_stars(WorldButtonsPanel): flow.itemR(world.stars, "average_separation", text="Separation") class WORLD_PT_ambient_occlusion(WorldButtonsPanel): - __label__ = "Ambient Occlusion" + bl_label = "Ambient Occlusion" COMPAT_ENGINES = set(['BLENDER_RENDER']) def draw_header(self, context): diff --git a/release/scripts/ui/space_buttons.py b/release/scripts/ui/space_buttons.py index 299e8bc9dae..fdbae7164b3 100644 --- a/release/scripts/ui/space_buttons.py +++ b/release/scripts/ui/space_buttons.py @@ -2,7 +2,7 @@ import bpy class Buttons_HT_header(bpy.types.Header): - __space_type__ = 'PROPERTIES' + bl_space_type = 'PROPERTIES' def draw(self, context): layout = self.layout @@ -22,7 +22,7 @@ class Buttons_HT_header(bpy.types.Header): row.itemR(scene, "current_frame") class Buttons_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/space_console.py b/release/scripts/ui/space_console.py index d02577d93e6..9bcd98be49e 100644 --- a/release/scripts/ui/space_console.py +++ b/release/scripts/ui/space_console.py @@ -3,7 +3,7 @@ import bpy class CONSOLE_HT_header(bpy.types.Header): - __space_type__ = 'CONSOLE' + bl_space_type = 'CONSOLE' def draw(self, context): sc = context.space_data @@ -41,7 +41,7 @@ class CONSOLE_HT_header(bpy.types.Header): class CONSOLE_MT_console(bpy.types.Menu): - __label__ = "Console" + bl_label = "Console" def draw(self, context): layout = self.layout @@ -52,7 +52,7 @@ class CONSOLE_MT_console(bpy.types.Menu): class CONSOLE_MT_report(bpy.types.Menu): - __label__ = "Report" + bl_label = "Report" def draw(self, context): layout = self.layout @@ -110,9 +110,9 @@ def get_console(console_id): class CONSOLE_OT_exec(bpy.types.Operator): '''Execute the current console line as a python expression.''' - __idname__ = "console.execute" - __label__ = "Console Execute" - __register__ = False + bl_idname = "console.execute" + bl_label = "Console Execute" + bl_register = False # Both prompts must be the same length PROMPT = '>>> ' @@ -190,9 +190,9 @@ class CONSOLE_OT_exec(bpy.types.Operator): class CONSOLE_OT_autocomplete(bpy.types.Operator): '''Evaluate the namespace up until the cursor and give a list of options or complete the name if there is only one.''' - __idname__ = "console.autocomplete" - __label__ = "Console Autocomplete" - __register__ = False + bl_idname = "console.autocomplete" + bl_label = "Console Autocomplete" + bl_register = False def poll(self, context): return context.space_data.console_type == 'PYTHON' diff --git a/release/scripts/ui/space_filebrowser.py b/release/scripts/ui/space_filebrowser.py index 1ab6a1f4f0b..28253a2a2b0 100644 --- a/release/scripts/ui/space_filebrowser.py +++ b/release/scripts/ui/space_filebrowser.py @@ -2,7 +2,7 @@ import bpy class FILEBROWSER_HT_header(bpy.types.Header): - __space_type__ = 'FILE_BROWSER' + bl_space_type = 'FILE_BROWSER' def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index 93d8043b61f..a69c225535f 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -2,7 +2,7 @@ import bpy class IMAGE_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -43,7 +43,7 @@ class IMAGE_MT_view(bpy.types.Menu): layout.itemO("screen.screen_full_area") class IMAGE_MT_select(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -63,7 +63,7 @@ class IMAGE_MT_select(bpy.types.Menu): layout.itemO("uv.select_linked") class IMAGE_MT_image(bpy.types.Menu): - __label__ = "Image" + bl_label = "Image" def draw(self, context): layout = self.layout @@ -106,7 +106,7 @@ class IMAGE_MT_image(bpy.types.Menu): layout.itemR(sima, "image_painting") class IMAGE_MT_uvs_showhide(bpy.types.Menu): - __label__ = "Show/Hide Faces" + bl_label = "Show/Hide Faces" def draw(self, context): layout = self.layout @@ -116,7 +116,7 @@ class IMAGE_MT_uvs_showhide(bpy.types.Menu): layout.item_booleanO("uv.hide", "unselected", True) class IMAGE_MT_uvs_transform(bpy.types.Menu): - __label__ = "Transform" + bl_label = "Transform" def draw(self, context): layout = self.layout @@ -126,7 +126,7 @@ class IMAGE_MT_uvs_transform(bpy.types.Menu): layout.itemO("tfm.resize") class IMAGE_MT_uvs_mirror(bpy.types.Menu): - __label__ = "Mirror" + bl_label = "Mirror" def draw(self, context): layout = self.layout @@ -139,7 +139,7 @@ class IMAGE_MT_uvs_mirror(bpy.types.Menu): props.constraint_axis[1]= True class IMAGE_MT_uvs_weldalign(bpy.types.Menu): - __label__ = "Weld/Align" + bl_label = "Weld/Align" def draw(self, context): layout = self.layout @@ -148,7 +148,7 @@ class IMAGE_MT_uvs_weldalign(bpy.types.Menu): layout.items_enumO("uv.align", "axis") # W, 2/3/4 class IMAGE_MT_uvs(bpy.types.Menu): - __label__ = "UVs" + bl_label = "UVs" def draw(self, context): layout = self.layout @@ -190,7 +190,7 @@ class IMAGE_MT_uvs(bpy.types.Menu): layout.itemM("IMAGE_MT_uvs_showhide") class IMAGE_HT_header(bpy.types.Header): - __space_type__ = 'IMAGE_EDITOR' + bl_space_type = 'IMAGE_EDITOR' def draw(self, context): layout = self.layout @@ -270,9 +270,9 @@ class IMAGE_HT_header(bpy.types.Header): layout.itemR(sima, "update_automatically", text="") class IMAGE_PT_image_properties(bpy.types.Panel): - __space_type__ = 'IMAGE_EDITOR' - __region_type__ = 'UI' - __label__ = "Image" + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'UI' + bl_label = "Image" def poll(self, context): sima = context.space_data @@ -288,9 +288,9 @@ class IMAGE_PT_image_properties(bpy.types.Panel): layout.template_image(sima, "image", iuser, compact=True) class IMAGE_PT_game_properties(bpy.types.Panel): - __space_type__ = 'IMAGE_EDITOR' - __region_type__ = 'UI' - __label__ = "Game Properties" + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'UI' + bl_label = "Game Properties" def poll(self, context): rd = context.scene.render_data @@ -332,9 +332,9 @@ class IMAGE_PT_game_properties(bpy.types.Panel): class IMAGE_PT_view_properties(bpy.types.Panel): - __space_type__ = 'IMAGE_EDITOR' - __region_type__ = 'UI' - __label__ = "Display" + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'UI' + bl_label = "Display" def poll(self, context): sima = context.space_data @@ -385,9 +385,9 @@ class IMAGE_PT_view_properties(bpy.types.Panel): #col.itemR(uvedit, "draw_faces") class IMAGE_PT_paint(bpy.types.Panel): - __space_type__ = 'IMAGE_EDITOR' - __region_type__ = 'UI' - __label__ = "Paint" + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'UI' + bl_label = "Paint" def poll(self, context): sima = context.space_data @@ -430,10 +430,10 @@ class IMAGE_PT_paint(bpy.types.Panel): col.itemR(brush, "blend", text="Blend") class IMAGE_PT_paint_stroke(bpy.types.Panel): - __space_type__ = 'IMAGE_EDITOR' - __region_type__ = 'UI' - __label__ = "Paint Stroke" - __default_closed__ = True + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'UI' + bl_label = "Paint Stroke" + bl_default_closed = True def poll(self, context): sima = context.space_data @@ -458,10 +458,10 @@ class IMAGE_PT_paint_stroke(bpy.types.Panel): row.itemR(brush, "use_spacing_pressure", toggle=True, text="") class IMAGE_PT_paint_curve(bpy.types.Panel): - __space_type__ = 'IMAGE_EDITOR' - __region_type__ = 'UI' - __label__ = "Paint Curve" - __default_closed__ = True + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'UI' + bl_label = "Paint Curve" + bl_default_closed = True def poll(self, context): sima = context.space_data diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index d4fcbbcdd4d..58ba96e0181 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -5,7 +5,7 @@ import dynamic_menu # reload(dynamic_menu) class INFO_HT_header(bpy.types.Header): - __space_type__ = 'INFO' + bl_space_type = 'INFO' def draw(self, context): layout = self.layout @@ -43,7 +43,7 @@ class INFO_HT_header(bpy.types.Header): layout.itemO("wm.window_fullscreen_toggle", icon='ICON_ARROW_LEFTRIGHT', text="") class INFO_MT_file(bpy.types.Menu): - __label__ = "File" + bl_label = "File" def draw(self, context): layout = self.layout @@ -85,7 +85,7 @@ class INFO_MT_file(bpy.types.Menu): # test for expanding menus ''' class INFO_MT_file_more(INFO_MT_file): - __label__ = "File" + bl_label = "File" def draw(self, context): layout = self.layout @@ -96,19 +96,19 @@ dynamic_menu.setup(INFO_MT_file_more) ''' class INFO_MT_file_import(dynamic_menu.DynMenu): - __label__ = "Import" + bl_label = "Import" def draw(self, context): self.layout.itemO("WM_OT_collada_import", text="COLLADA (.dae)...") class INFO_MT_file_export(dynamic_menu.DynMenu): - __label__ = "Export" + bl_label = "Export" def draw(self, context): self.layout.itemO("WM_OT_collada_export", text="COLLADA (.dae)...") class INFO_MT_file_external_data(bpy.types.Menu): - __label__ = "External Data" + bl_label = "External Data" def draw(self, context): layout = self.layout @@ -124,7 +124,7 @@ class INFO_MT_file_external_data(bpy.types.Menu): layout.itemO("file.find_missing_files") class INFO_MT_mesh_add(dynamic_menu.DynMenu): - __label__ = "Mesh" + bl_label = "Mesh" def draw(self, context): layout = self.layout layout.operator_context = 'INVOKE_REGION_WIN' @@ -140,7 +140,7 @@ class INFO_MT_mesh_add(dynamic_menu.DynMenu): layout.itemO("mesh.primitive_monkey_add", icon='ICON_MESH_MONKEY', text="Monkey") class INFO_MT_add(bpy.types.Menu): - __label__ = "Add" + bl_label = "Add" def draw(self, context): layout = self.layout @@ -175,7 +175,7 @@ class INFO_MT_add(bpy.types.Menu): layout.item_menu_enumO("object.group_instance_add", "type", text="Group Instance", icon='ICON_OUTLINER_OB_EMPTY') class INFO_MT_game(bpy.types.Menu): - __label__ = "Game" + bl_label = "Game" def draw(self, context): layout = self.layout @@ -192,7 +192,7 @@ class INFO_MT_game(bpy.types.Menu): layout.itemR(gs, "deprecation_warnings") class INFO_MT_render(bpy.types.Menu): - __label__ = "Render" + bl_label = "Render" def draw(self, context): layout = self.layout @@ -212,7 +212,7 @@ class INFO_MT_render(bpy.types.Menu): layout.itemO("screen.render_view_show") class INFO_MT_help(bpy.types.Menu): - __label__ = "Help" + bl_label = "Help" def draw(self, context): layout = self.layout @@ -247,54 +247,54 @@ bpy.types.register(INFO_MT_help) class HelpOperator(bpy.types.Operator): def execute(self, context): import webbrowser - webbrowser.open(self.__URL__) + webbrowser.open(self._url) return ('FINISHED',) class HELP_OT_manual(HelpOperator): '''The Blender Wiki manual''' - __idname__ = "help.manual" - __label__ = "Manual" - __URL__ = 'http://wiki.blender.org/index.php/Manual' + bl_idname = "help.manual" + bl_label = "Manual" + _url = 'http://wiki.blender.org/index.php/Manual' class HELP_OT_release_logs(HelpOperator): '''Information about the changes in this version of Blender''' - __idname__ = "help.release_logs" - __label__ = "Release Logs" - __URL__ = 'http://www.blender.org/development/release-logs/' + bl_idname = "help.release_logs" + bl_label = "Release Logs" + _url = 'http://www.blender.org/development/release-logs/' class HELP_OT_blender_website(HelpOperator): '''The official Blender website''' - __idname__ = "help.blender_website" - __label__ = "Blender Website" - __URL__ = 'http://www.blender.org/' + bl_idname = "help.blender_website" + bl_label = "Blender Website" + _url = 'http://www.blender.org/' class HELP_OT_blender_eshop(HelpOperator): '''Buy official Blender resources and merchandise online''' - __idname__ = "help.blender_eshop" - __label__ = "Blender e-Shop" - __URL__ = 'http://www.blender3d.org/e-shop' + bl_idname = "help.blender_eshop" + bl_label = "Blender e-Shop" + _url = 'http://www.blender3d.org/e-shop' class HELP_OT_developer_community(HelpOperator): '''Get involved with Blender development''' - __idname__ = "help.developer_community" - __label__ = "Developer Community" - __URL__ = 'http://www.blender.org/community/get-involved/' + bl_idname = "help.developer_community" + bl_label = "Developer Community" + _url = 'http://www.blender.org/community/get-involved/' class HELP_OT_user_community(HelpOperator): '''Get involved with other Blender users''' - __idname__ = "help.user_community" - __label__ = "User Community" - __URL__ = 'http://www.blender.org/community/user-community/' + bl_idname = "help.user_community" + bl_label = "User Community" + _url = 'http://www.blender.org/community/user-community/' class HELP_OT_report_bug(HelpOperator): '''Report a bug in the Blender bug tracker''' - __idname__ = "help.report_bug" - __label__ = "Report a Bug" - __URL__ = 'http://projects.blender.org/tracker/?atid=498&group_id=9&func=browse' + bl_idname = "help.report_bug" + bl_label = "Report a Bug" + _url = 'http://projects.blender.org/tracker/?atid=498&group_id=9&func=browse' class HELP_OT_operator_cheat_sheet(bpy.types.Operator): - __idname__ = "help.operator_cheat_sheet" - __label__ = "Operator Cheat Sheet (new textblock)" + bl_idname = "help.operator_cheat_sheet" + bl_label = "Operator Cheat Sheet (new textblock)" def execute(self, context): op_strings = [] tot = 0 diff --git a/release/scripts/ui/space_logic.py b/release/scripts/ui/space_logic.py index 5748d15a53a..7c6ce62bb6b 100644 --- a/release/scripts/ui/space_logic.py +++ b/release/scripts/ui/space_logic.py @@ -1,9 +1,9 @@ import bpy class LOGIC_PT_properties(bpy.types.Panel): - __space_type__ = 'LOGIC_EDITOR' - __region_type__ = 'UI' - __label__ = "Properties" + bl_space_type = 'LOGIC_EDITOR' + bl_region_type = 'UI' + bl_label = "Properties" def poll(self, context): ob = context.active_object diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index 5c5c49afbc7..f9d1b59e3ec 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -2,7 +2,7 @@ import bpy class NODE_HT_header(bpy.types.Header): - __space_type__ = 'NODE_EDITOR' + bl_space_type = 'NODE_EDITOR' def draw(self, context): layout = self.layout @@ -48,7 +48,7 @@ class NODE_HT_header(bpy.types.Header): layout.itemR(snode, "backdrop") class NODE_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -65,7 +65,7 @@ class NODE_MT_view(bpy.types.Menu): layout.itemO("screen.screen_full_area") class NODE_MT_select(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -78,7 +78,7 @@ class NODE_MT_select(bpy.types.Menu): layout.itemO("node.select_linked_to") class NODE_MT_node(bpy.types.Menu): - __label__ = "Node" + bl_label = "Node" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/ui/space_outliner.py index 40816309e7e..b3cb04e9286 100644 --- a/release/scripts/ui/space_outliner.py +++ b/release/scripts/ui/space_outliner.py @@ -2,7 +2,7 @@ import bpy class OUTLINER_HT_header(bpy.types.Header): - __space_type__ = 'OUTLINER' + bl_space_type = 'OUTLINER' def draw(self, context): layout = self.layout @@ -41,7 +41,7 @@ class OUTLINER_HT_header(bpy.types.Header): row.itemL(text="No Keying Set active") class OUTLINER_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -58,7 +58,7 @@ class OUTLINER_MT_view(bpy.types.Menu): col.itemO("outliner.show_hierarchy") class OUTLINER_MT_edit_datablocks(bpy.types.Menu): - __label__ = "Edit" + bl_label = "Edit" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 59066097879..5d5f4ed662f 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -7,7 +7,7 @@ def act_strip(context): # Header class SEQUENCER_HT_header(bpy.types.Header): - __space_type__ = 'SEQUENCE_EDITOR' + bl_space_type = 'SEQUENCE_EDITOR' def draw(self, context): layout = self.layout @@ -38,7 +38,7 @@ class SEQUENCER_HT_header(bpy.types.Header): layout.itemR(st, "display_channel", text="Channel") class SEQUENCER_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -105,7 +105,7 @@ class SEQUENCER_MT_view(bpy.types.Menu): """ class SEQUENCER_MT_select(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -125,7 +125,7 @@ class SEQUENCER_MT_select(bpy.types.Menu): layout.itemO("sequencer.select_inverse") class SEQUENCER_MT_marker(bpy.types.Menu): - __label__ = "Marker (TODO)" + bl_label = "Marker (TODO)" def draw(self, context): layout = self.layout @@ -143,7 +143,7 @@ class SEQUENCER_MT_marker(bpy.types.Menu): #layout.itemO("sequencer.sound_strip_add", text="Transform Markers") # toggle, will be rna - (sseq->flag & SEQ_MARKER_TRANS) class SEQUENCER_MT_add(bpy.types.Menu): - __label__ = "Add" + bl_label = "Add" def draw(self, context): layout = self.layout @@ -160,7 +160,7 @@ class SEQUENCER_MT_add(bpy.types.Menu): layout.itemM("SEQUENCER_MT_add_effect") class SEQUENCER_MT_add_effect(bpy.types.Menu): - __label__ = "Effect Strip..." + bl_label = "Effect Strip..." def draw(self, context): layout = self.layout @@ -183,7 +183,7 @@ class SEQUENCER_MT_add_effect(bpy.types.Menu): layout.item_enumO("sequencer.effect_strip_add", 'type', 'SPEED') class SEQUENCER_MT_strip(bpy.types.Menu): - __label__ = "Strip" + bl_label = "Strip" def draw(self, context): layout = self.layout @@ -252,21 +252,21 @@ class SEQUENCER_MT_strip(bpy.types.Menu): # Panels class SequencerButtonsPanel(bpy.types.Panel): - __space_type__ = 'SEQUENCE_EDITOR' - __region_type__ = 'UI' + bl_space_type = 'SEQUENCE_EDITOR' + bl_region_type = 'UI' def poll(self, context): return context.space_data.display_mode == 'SEQUENCER' and act_strip(context) != None class SequencerButtonsPanel_Output(bpy.types.Panel): - __space_type__ = 'SEQUENCE_EDITOR' - __region_type__ = 'UI' + bl_space_type = 'SEQUENCE_EDITOR' + bl_region_type = 'UI' def poll(self, context): return context.space_data.display_mode != 'SEQUENCER' class SEQUENCER_PT_edit(SequencerButtonsPanel): - __label__ = "Edit Strip" + bl_label = "Edit Strip" def draw(self, context): layout = self.layout @@ -317,7 +317,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): col.itemR(strip, "end_still", text="End") class SEQUENCER_PT_effect(SequencerButtonsPanel): - __label__ = "Effect Strip" + bl_label = "Effect Strip" def poll(self, context): if context.space_data.display_mode != 'SEQUENCER': @@ -404,7 +404,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel): col.itemR(strip, "rotation_end", text="End") class SEQUENCER_PT_input(SequencerButtonsPanel): - __label__ = "Strip Input" + bl_label = "Strip Input" def poll(self, context): if context.space_data.display_mode != 'SEQUENCER': @@ -459,7 +459,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel): col.itemR(strip, "animation_end_offset", text="End") class SEQUENCER_PT_sound(SequencerButtonsPanel): - __label__ = "Sound" + bl_label = "Sound" def poll(self, context): if context.space_data.display_mode != 'SEQUENCER': @@ -490,7 +490,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel): row.itemR(strip.sound, "caching") class SEQUENCER_PT_filter(SequencerButtonsPanel): - __label__ = "Filter" + bl_label = "Filter" def poll(self, context): if context.space_data.display_mode != 'SEQUENCER': @@ -539,7 +539,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel): col.itemR(strip.color_balance, "inverse_gain", text="Inverse") class SEQUENCER_PT_proxy(SequencerButtonsPanel): - __label__ = "Proxy" + bl_label = "Proxy" def poll(self, context): if context.space_data.display_mode != 'SEQUENCER': @@ -568,7 +568,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel): flow.itemR(strip.proxy, "file") class SEQUENCER_PT_view(SequencerButtonsPanel_Output): - __label__ = "View Settings" + bl_label = "View Settings" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/space_text.py b/release/scripts/ui/space_text.py index 479f2b60f51..97052c68043 100644 --- a/release/scripts/ui/space_text.py +++ b/release/scripts/ui/space_text.py @@ -2,7 +2,7 @@ import bpy class TEXT_HT_header(bpy.types.Header): - __space_type__ = 'TEXT_EDITOR' + bl_space_type = 'TEXT_EDITOR' def draw(self, context): layout = self.layout @@ -49,9 +49,9 @@ class TEXT_HT_header(bpy.types.Header): row.itemO("text.run_script") class TEXT_PT_properties(bpy.types.Panel): - __space_type__ = 'TEXT_EDITOR' - __region_type__ = 'UI' - __label__ = "Properties" + bl_space_type = 'TEXT_EDITOR' + bl_region_type = 'UI' + bl_label = "Properties" def draw(self, context): layout = self.layout @@ -69,9 +69,9 @@ class TEXT_PT_properties(bpy.types.Panel): flow.itemR(st, "tab_width") class TEXT_PT_find(bpy.types.Panel): - __space_type__ = 'TEXT_EDITOR' - __region_type__ = 'UI' - __label__ = "Find" + bl_space_type = 'TEXT_EDITOR' + bl_region_type = 'UI' + bl_label = "Find" def draw(self, context): layout = self.layout @@ -101,7 +101,7 @@ class TEXT_PT_find(bpy.types.Panel): row.itemR(st, "find_all", text="All") class TEXT_MT_text(bpy.types.Menu): - __label__ = "Text" + bl_label = "Text" def draw(self, context): layout = self.layout @@ -151,7 +151,7 @@ class TEXT_MT_templates(bpy.types.Menu): ''' Creates the menu items by scanning scripts/templates ''' - __label__ = "Script Templates" + bl_label = "Script Templates" def draw(self, context): import os @@ -175,7 +175,7 @@ class TEXT_MT_templates(bpy.types.Menu): class TEXT_MT_edit_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -184,7 +184,7 @@ class TEXT_MT_edit_view(bpy.types.Menu): layout.item_enumO("text.move", "type", 'FILE_BOTTOM', text="Bottom of File") class TEXT_MT_edit_select(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -193,7 +193,7 @@ class TEXT_MT_edit_select(bpy.types.Menu): layout.itemO("text.select_line") class TEXT_MT_edit_markers(bpy.types.Menu): - __label__ = "Markers" + bl_label = "Markers" def draw(self, context): layout = self.layout @@ -203,7 +203,7 @@ class TEXT_MT_edit_markers(bpy.types.Menu): layout.itemO("text.previous_marker") class TEXT_MT_format(bpy.types.Menu): - __label__ = "Format" + bl_label = "Format" def draw(self, context): layout = self.layout @@ -221,7 +221,7 @@ class TEXT_MT_format(bpy.types.Menu): layout.item_menu_enumO("text.convert_whitespace", "type") class TEXT_MT_edit_to3d(bpy.types.Menu): - __label__ = "Text To 3D Object" + bl_label = "Text To 3D Object" def draw(self, context): layout = self.layout @@ -230,7 +230,7 @@ class TEXT_MT_edit_to3d(bpy.types.Menu): layout.item_booleanO("text.to_3d_object", "split_lines", True, text="One Object Per Line"); class TEXT_MT_edit(bpy.types.Menu): - __label__ = "Edit" + bl_label = "Edit" def poll(self, context): return (context.space_data.text) diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index 2ead4305960..1e385be06dd 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -2,7 +2,7 @@ import bpy class TIME_HT_header(bpy.types.Header): - __space_type__ = 'TIMELINE' + bl_space_type = 'TIMELINE' def draw(self, context): layout = self.layout @@ -64,7 +64,7 @@ class TIME_HT_header(bpy.types.Header): row.itemO("anim.delete_keyframe", text="", icon='ICON_KEY_DEHLT') class TIME_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -78,7 +78,7 @@ class TIME_MT_view(bpy.types.Menu): layout.itemR(st, "only_selected") class TIME_MT_frame(bpy.types.Menu): - __label__ = "Frame" + bl_label = "Frame" def draw(self, context): layout = self.layout @@ -102,7 +102,7 @@ class TIME_MT_frame(bpy.types.Menu): sub.itemM("TIME_MT_autokey") class TIME_MT_playback(bpy.types.Menu): - __label__ = "Playback" + bl_label = "Playback" def draw(self, context): layout = self.layout @@ -129,7 +129,7 @@ class TIME_MT_playback(bpy.types.Menu): layout.itemR(scene, "scrub_audio") class TIME_MT_autokey(bpy.types.Menu): - __label__ = "Auto-Keyframing Mode" + bl_label = "Auto-Keyframing Mode" def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 10e1831de0f..c03c9ff2a2f 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -2,7 +2,7 @@ import bpy class USERPREF_HT_header(bpy.types.Header): - __space_type__ = 'USER_PREFERENCES' + bl_space_type = 'USER_PREFERENCES' def draw(self, context): layout = self.layout @@ -18,14 +18,14 @@ class USERPREF_HT_header(bpy.types.Header): layout.itemO("wm.keyconfig_export", "Export Key Configuration...") class USERPREF_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout class USERPREF_PT_tabs(bpy.types.Panel): - __space_type__ = 'USER_PREFERENCES' - __show_header__ = False + bl_space_type = 'USER_PREFERENCES' + bl_show_header = False def draw(self, context): layout = self.layout @@ -35,9 +35,9 @@ class USERPREF_PT_tabs(bpy.types.Panel): layout.itemR(userpref, "active_section", expand=True) class USERPREF_PT_interface(bpy.types.Panel): - __space_type__ = 'USER_PREFERENCES' - __label__ = "Interface" - __show_header__ = False + bl_space_type = 'USER_PREFERENCES' + bl_label = "Interface" + bl_show_header = False def poll(self, context): userpref = context.user_preferences @@ -119,9 +119,9 @@ class USERPREF_PT_interface(bpy.types.Panel): sub1.itemR(view, "open_sublevel_delay", text="Sub Level") class USERPREF_PT_edit(bpy.types.Panel): - __space_type__ = 'USER_PREFERENCES' - __label__ = "Edit" - __show_header__ = False + bl_space_type = 'USER_PREFERENCES' + bl_label = "Edit" + bl_show_header = False def poll(self, context): userpref = context.user_preferences @@ -222,9 +222,9 @@ class USERPREF_PT_edit(bpy.types.Panel): sub1.itemR(edit, "duplicate_particle", text="Particle") class USERPREF_PT_system(bpy.types.Panel): - __space_type__ = 'USER_PREFERENCES' - __label__ = "System" - __show_header__ = False + bl_space_type = 'USER_PREFERENCES' + bl_label = "System" + bl_show_header = False def poll(self, context): userpref = context.user_preferences @@ -313,9 +313,9 @@ class USERPREF_PT_system(bpy.types.Panel): sub1.itemR(system, "memory_cache_limit") class USERPREF_PT_file(bpy.types.Panel): - __space_type__ = 'USER_PREFERENCES' - __label__ = "Files" - __show_header__ = False + bl_space_type = 'USER_PREFERENCES' + bl_label = "Files" + bl_show_header = False def poll(self, context): userpref = context.user_preferences @@ -379,9 +379,9 @@ class USERPREF_PT_file(bpy.types.Panel): sub3.itemR(paths, "auto_save_time", text="Timer (mins)") class USERPREF_PT_input(bpy.types.Panel): - __space_type__ = 'USER_PREFERENCES' - __label__ = "Input" - __show_header__ = False + bl_space_type = 'USER_PREFERENCES' + bl_label = "Input" + bl_show_header = False def poll(self, context): userpref = context.user_preferences @@ -556,9 +556,9 @@ bpy.types.register(USERPREF_PT_input) class WM_OT_keyconfig_export(bpy.types.Operator): "Export key configuration to a python script." - __idname__ = "wm.keyconfig_export" - __label__ = "Export Key Configuration..." - __props__ = [ + bl_idname = "wm.keyconfig_export" + bl_label = "Export Key Configuration..." + bl_props = [ bpy.props.StringProperty(attr="path", name="File Path", description="File path to write file to.")] def _string_value(self, value): @@ -644,8 +644,8 @@ class WM_OT_keyconfig_export(bpy.types.Operator): class WM_OT_keymap_edit(bpy.types.Operator): "Edit key map." - __idname__ = "wm.keymap_edit" - __label__ = "Edit Key Map" + bl_idname = "wm.keymap_edit" + bl_label = "Edit Key Map" def execute(self, context): wm = context.manager @@ -655,9 +655,9 @@ class WM_OT_keymap_edit(bpy.types.Operator): class WM_OT_keymap_restore(bpy.types.Operator): "Restore key map" - __idname__ = "wm.keymap_restore" - __label__ = "Restore Key Map" - __props__ = [bpy.props.BoolProperty(attr="all", name="All Keymaps", description="Restore all keymaps to default.")] + bl_idname = "wm.keymap_restore" + bl_label = "Restore Key Map" + bl_props = [bpy.props.BoolProperty(attr="all", name="All Keymaps", description="Restore all keymaps to default.")] def execute(self, context): wm = context.manager @@ -673,8 +673,8 @@ class WM_OT_keymap_restore(bpy.types.Operator): class WM_OT_keyitem_add(bpy.types.Operator): "Add key map item." - __idname__ = "wm.keyitem_add" - __label__ = "Add Key Map Item" + bl_idname = "wm.keyitem_add" + bl_label = "Add Key Map Item" def execute(self, context): wm = context.manager @@ -684,8 +684,8 @@ class WM_OT_keyitem_add(bpy.types.Operator): class WM_OT_keyitem_remove(bpy.types.Operator): "Remove key map item." - __idname__ = "wm.keyitem_remove" - __label__ = "Remove Key Map Item" + bl_idname = "wm.keyitem_remove" + bl_label = "Remove Key Map Item" def execute(self, context): wm = context.manager diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 90447b6d777..0a132355bf9 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -6,7 +6,7 @@ import dynamic_menu # ********** Header ********** class VIEW3D_HT_header(bpy.types.Header): - __space_type__ = 'VIEW_3D' + bl_space_type = 'VIEW_3D' def draw(self, context): layout = self.layout @@ -46,7 +46,7 @@ class VIEW3D_HT_header(bpy.types.Header): # ********** Utilities ********** class VIEW3D_MT_showhide(bpy.types.Menu): - __label__ = "Show/Hide" + bl_label = "Show/Hide" _operator_name = "" def draw(self, context): @@ -57,7 +57,7 @@ class VIEW3D_MT_showhide(bpy.types.Menu): layout.item_booleanO("%s.hide" % self._operator_name, "unselected", True, text="Hide Unselected") class VIEW3D_MT_snap(bpy.types.Menu): - __label__ = "Snap" + bl_label = "Snap" def draw(self, context): layout = self.layout @@ -75,7 +75,7 @@ class VIEW3D_MT_snap(bpy.types.Menu): # ********** View menus ********** class VIEW3D_MT_view(bpy.types.Menu): - __label__ = "View" + bl_label = "View" def draw(self, context): layout = self.layout @@ -127,7 +127,7 @@ class VIEW3D_MT_view(bpy.types.Menu): layout.itemO("screen.animation_play", text="Playback Animation", icon='ICON_PLAY') class VIEW3D_MT_view_navigation(bpy.types.Menu): - __label__ = "Navigation" + bl_label = "Navigation" def draw(self, context): layout = self.layout @@ -148,7 +148,7 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu): layout.itemO("view3d.fly") class VIEW3D_MT_view_align(bpy.types.Menu): - __label__ = "Align View" + bl_label = "Align View" def draw(self, context): layout = self.layout @@ -158,7 +158,7 @@ class VIEW3D_MT_view_align(bpy.types.Menu): layout.itemO("view3d.view_center") class VIEW3D_MT_view_cameras(bpy.types.Menu): - __label__ = "Cameras" + bl_label = "Cameras" def draw(self, context): layout = self.layout @@ -169,7 +169,7 @@ class VIEW3D_MT_view_cameras(bpy.types.Menu): # ********** Select menus, suffix from context.mode ********** class VIEW3D_MT_select_object(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -188,7 +188,7 @@ class VIEW3D_MT_select_object(bpy.types.Menu): layout.itemO("object.select_pattern", text="Select Pattern...") class VIEW3D_MT_select_pose(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -218,7 +218,7 @@ class VIEW3D_MT_select_pose(bpy.types.Menu): props.direction = 'CHILD' class VIEW3D_MT_select_particle(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -236,7 +236,7 @@ class VIEW3D_MT_select_particle(bpy.types.Menu): layout.itemO("particle.select_less") class VIEW3D_MT_select_edit_mesh(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -281,7 +281,7 @@ class VIEW3D_MT_select_edit_mesh(bpy.types.Menu): layout.itemO("mesh.region_to_loop") class VIEW3D_MT_select_edit_curve(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -309,7 +309,7 @@ class VIEW3D_MT_select_edit_curve(bpy.types.Menu): layout.itemO("curve.select_less") class VIEW3D_MT_select_edit_surface(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -334,7 +334,7 @@ class VIEW3D_MT_select_edit_surface(bpy.types.Menu): layout.itemO("curve.select_less") class VIEW3D_MT_select_edit_metaball(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -351,7 +351,7 @@ class VIEW3D_MT_select_edit_metaball(bpy.types.Menu): layout.itemO("mball.select_random_metaelems") class VIEW3D_MT_select_edit_lattice(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -363,7 +363,7 @@ class VIEW3D_MT_select_edit_lattice(bpy.types.Menu): layout.itemO("lattice.select_all_toggle", text="Select/Deselect All") class VIEW3D_MT_select_edit_armature(bpy.types.Menu): - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -391,7 +391,7 @@ class VIEW3D_MT_select_edit_armature(bpy.types.Menu): props.direction = 'CHILD' class VIEW3D_MT_select_face(bpy.types.Menu):# XXX no matching enum - __label__ = "Select" + bl_label = "Select" def draw(self, context): layout = self.layout @@ -401,8 +401,8 @@ class VIEW3D_MT_select_face(bpy.types.Menu):# XXX no matching enum # ********** Object menu ********** class VIEW3D_MT_object(bpy.types.Menu): - __context__ = "objectmode" - __label__ = "Object" + bl_context = "objectmode" + bl_label = "Object" def draw(self, context): layout = self.layout @@ -444,7 +444,7 @@ class VIEW3D_MT_object(bpy.types.Menu): layout.item_menu_enumO("object.convert", "target") class VIEW3D_MT_object_clear(bpy.types.Menu): - __label__ = "Clear" + bl_label = "Clear" def draw(self, context): layout = self.layout @@ -455,7 +455,7 @@ class VIEW3D_MT_object_clear(bpy.types.Menu): layout.itemO("object.origin_clear", text="Origin") class VIEW3D_MT_object_apply(bpy.types.Menu): - __label__ = "Apply" + bl_label = "Apply" def draw(self, context): layout = self.layout @@ -469,7 +469,7 @@ class VIEW3D_MT_object_apply(bpy.types.Menu): class VIEW3D_MT_object_parent(bpy.types.Menu): - __label__ = "Parent" + bl_label = "Parent" def draw(self, context): layout = self.layout @@ -478,7 +478,7 @@ class VIEW3D_MT_object_parent(bpy.types.Menu): layout.itemO("object.parent_clear", text="Clear") class VIEW3D_MT_object_track(bpy.types.Menu): - __label__ = "Track" + bl_label = "Track" def draw(self, context): layout = self.layout @@ -487,7 +487,7 @@ class VIEW3D_MT_object_track(bpy.types.Menu): layout.itemO("object.track_clear", text="Clear") class VIEW3D_MT_object_group(bpy.types.Menu): - __label__ = "Group" + bl_label = "Group" def draw(self, context): layout = self.layout @@ -501,7 +501,7 @@ class VIEW3D_MT_object_group(bpy.types.Menu): layout.itemO("group.objects_remove_active") class VIEW3D_MT_object_constraints(bpy.types.Menu): - __label__ = "Constraints" + bl_label = "Constraints" def draw(self, context): layout = self.layout @@ -510,7 +510,7 @@ class VIEW3D_MT_object_constraints(bpy.types.Menu): layout.itemO("object.constraints_clear") class VIEW3D_MT_object_showhide(bpy.types.Menu): - __label__ = "Show/Hide" + bl_label = "Show/Hide" def draw(self, context): layout = self.layout @@ -520,7 +520,7 @@ class VIEW3D_MT_object_showhide(bpy.types.Menu): layout.item_booleanO("object.restrictview_set", "unselected", True, text="Hide Unselected") class VIEW3D_MT_make_single_user(bpy.types.Menu): - __label__ = "Make Single User" + bl_label = "Make Single User" def draw(self, context): layout = self.layout @@ -543,7 +543,7 @@ class VIEW3D_MT_make_single_user(bpy.types.Menu): # ********** Vertex paint menu ********** class VIEW3D_MT_paint_vertex(bpy.types.Menu): - __label__ = "Paint" + bl_label = "Paint" def draw(self, context): layout = self.layout @@ -557,7 +557,7 @@ class VIEW3D_MT_paint_vertex(bpy.types.Menu): # ********** Sculpt menu ********** class VIEW3D_MT_sculpt(bpy.types.Menu): - __label__ = "Sculpt" + bl_label = "Sculpt" def draw(self, context): layout = self.layout @@ -592,7 +592,7 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): # ********** Particle menu ********** class VIEW3D_MT_particle(bpy.types.Menu): - __label__ = "Particle" + bl_label = "Particle" def draw(self, context): layout = self.layout @@ -621,7 +621,7 @@ class VIEW3D_MT_particle_showhide(VIEW3D_MT_showhide): # ********** Pose Menu ********** class VIEW3D_MT_pose(bpy.types.Menu): - __label__ = "Pose" + bl_label = "Pose" def draw(self, context): layout = self.layout @@ -680,7 +680,7 @@ class VIEW3D_MT_pose(bpy.types.Menu): layout.item_menu_enumO("pose.flags_set", 'mode', text="Bone Settings") class VIEW3D_MT_pose_transform(bpy.types.Menu): - __label__ = "Clear Transform" + bl_label = "Clear Transform" def draw(self, context): layout = self.layout @@ -694,7 +694,7 @@ class VIEW3D_MT_pose_transform(bpy.types.Menu): layout.itemL(text="Origin") class VIEW3D_MT_pose_pose(bpy.types.Menu): - __label__ = "Pose Library" + bl_label = "Pose Library" def draw(self, context): layout = self.layout @@ -708,7 +708,7 @@ class VIEW3D_MT_pose_pose(bpy.types.Menu): layout.itemO("poselib.pose_remove", text="Remove Pose...") class VIEW3D_MT_pose_motion(bpy.types.Menu): - __label__ = "Motion Paths" + bl_label = "Motion Paths" def draw(self, context): layout = self.layout @@ -717,7 +717,7 @@ class VIEW3D_MT_pose_motion(bpy.types.Menu): layout.itemO("pose.paths_clear", text="Clear") class VIEW3D_MT_pose_group(bpy.types.Menu): - __label__ = "Bone Groups" + bl_label = "Bone Groups" def draw(self, context): layout = self.layout @@ -731,7 +731,7 @@ class VIEW3D_MT_pose_group(bpy.types.Menu): class VIEW3D_MT_pose_ik(bpy.types.Menu): - __label__ = "Inverse Kinematics" + bl_label = "Inverse Kinematics" def draw(self, context): layout = self.layout @@ -740,7 +740,7 @@ class VIEW3D_MT_pose_ik(bpy.types.Menu): layout.itemO("pose.ik_clear") class VIEW3D_MT_pose_constraints(bpy.types.Menu): - __label__ = "Constraints" + bl_label = "Constraints" def draw(self, context): layout = self.layout @@ -755,7 +755,7 @@ class VIEW3D_MT_pose_showhide(VIEW3D_MT_showhide): # Edit MESH class VIEW3D_MT_edit_mesh(bpy.types.Menu): - __label__ = "Mesh" + bl_label = "Mesh" def draw(self, context): layout = self.layout @@ -798,7 +798,7 @@ class VIEW3D_MT_edit_mesh(bpy.types.Menu): # Only used by the menu class VIEW3D_MT_edit_mesh_specials(bpy.types.Menu): - __label__ = "Specials" + bl_label = "Specials" def draw(self, context): layout = self.layout @@ -822,7 +822,7 @@ class VIEW3D_MT_edit_mesh_specials(bpy.types.Menu): layout.itemO("mesh.select_vertex_path") class VIEW3D_MT_edit_mesh_vertices(bpy.types.Menu): - __label__ = "Vertices" + bl_label = "Vertices" def draw(self, context): layout = self.layout @@ -846,7 +846,7 @@ class VIEW3D_MT_edit_mesh_vertices(bpy.types.Menu): layout.itemO("mesh.shape_propagate_to_all") class VIEW3D_MT_edit_mesh_edges(bpy.types.Menu): - __label__ = "Edges" + bl_label = "Edges" def draw(self, context): layout = self.layout @@ -885,7 +885,7 @@ class VIEW3D_MT_edit_mesh_edges(bpy.types.Menu): class VIEW3D_MT_edit_mesh_faces(dynamic_menu.DynMenu): - __label__ = "Faces" + bl_label = "Faces" def draw(self, context): layout = self.layout @@ -925,7 +925,7 @@ class VIEW3D_MT_edit_mesh_faces(dynamic_menu.DynMenu): class VIEW3D_MT_edit_mesh_normals(bpy.types.Menu): - __label__ = "Normals" + bl_label = "Normals" def draw(self, context): layout = self.layout @@ -974,12 +974,12 @@ def draw_curve(self, context): layout.itemM("VIEW3D_MT_edit_curve_showhide") class VIEW3D_MT_edit_curve(bpy.types.Menu): - __label__ = "Curve" + bl_label = "Curve" draw = draw_curve class VIEW3D_MT_edit_curve_ctrlpoints(bpy.types.Menu): - __label__ = "Control Points" + bl_label = "Control Points" def draw(self, context): layout = self.layout @@ -996,7 +996,7 @@ class VIEW3D_MT_edit_curve_ctrlpoints(bpy.types.Menu): layout.item_menu_enumO("curve.handle_type_set", "type") class VIEW3D_MT_edit_curve_segments(bpy.types.Menu): - __label__ = "Segments" + bl_label = "Segments" def draw(self, context): layout = self.layout @@ -1009,13 +1009,13 @@ class VIEW3D_MT_edit_curve_showhide(VIEW3D_MT_showhide): # Edit SURFACE class VIEW3D_MT_edit_surface(bpy.types.Menu): - __label__ = "Surface" + bl_label = "Surface" draw = draw_curve # Edit TEXT class VIEW3D_MT_edit_text(bpy.types.Menu): - __label__ = "Text" + bl_label = "Text" def draw(self, context): layout = self.layout @@ -1027,7 +1027,7 @@ class VIEW3D_MT_edit_text(bpy.types.Menu): layout.itemm("view3d_mt_edit_text_chars") class VIEW3D_MT_edit_text_chars(bpy.types.Menu): - __label__ = "Special Characters" + bl_label = "Special Characters" def draw(self, context): layout = self.layout @@ -1061,7 +1061,7 @@ class VIEW3D_MT_edit_text_chars(bpy.types.Menu): # Edit META class VIEW3D_MT_edit_meta(bpy.types.Menu): - __label__ = "Metaball" + bl_label = "Metaball" def draw(self, context): layout = self.layout @@ -1090,7 +1090,7 @@ class VIEW3D_MT_edit_meta(bpy.types.Menu): layout.itemM("VIEW3D_MT_edit_meta_showhide") class VIEW3D_MT_edit_meta_showhide(bpy.types.Menu): - __label__ = "Show/Hide" + bl_label = "Show/Hide" def draw(self, context): layout = self.layout @@ -1101,7 +1101,7 @@ class VIEW3D_MT_edit_meta_showhide(bpy.types.Menu): # Edit LATTICE class VIEW3D_MT_edit_lattice(bpy.types.Menu): - __label__ = "Lattice" + bl_label = "Lattice" def draw(self, context): layout = self.layout @@ -1121,7 +1121,7 @@ class VIEW3D_MT_edit_lattice(bpy.types.Menu): # Edit ARMATURE class VIEW3D_MT_edit_armature(bpy.types.Menu): - __label__ = "Armature" + bl_label = "Armature" def draw(self, context): layout = self.layout @@ -1178,7 +1178,7 @@ class VIEW3D_MT_edit_armature(bpy.types.Menu): layout.item_menu_enumO("armature.flags_set", "mode", text="Bone Settings") class VIEW3D_MT_edit_armature_parent(bpy.types.Menu): - __label__ = "Parent" + bl_label = "Parent" def draw(self, context): layout = self.layout @@ -1187,7 +1187,7 @@ class VIEW3D_MT_edit_armature_parent(bpy.types.Menu): layout.itemO("armature.parent_clear", text="Clear") class VIEW3D_MT_edit_armature_roll(bpy.types.Menu): - __label__ = "Bone Roll" + bl_label = "Bone Roll" def draw(self, context): layout = self.layout @@ -1202,9 +1202,9 @@ class VIEW3D_MT_edit_armature_roll(bpy.types.Menu): # ********** Panel ********** class VIEW3D_PT_3dview_properties(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "View" + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "View" def poll(self, context): view = context.space_data @@ -1235,10 +1235,10 @@ class VIEW3D_PT_3dview_properties(bpy.types.Panel): layout.column().itemR(scene, "cursor_location", text="3D Cursor:") class VIEW3D_PT_3dview_display(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "Display" - __default_closed__ = True + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "Display" + bl_default_closed = True def poll(self, context): view = context.space_data @@ -1278,9 +1278,9 @@ class VIEW3D_PT_3dview_display(bpy.types.Panel): # col.itemR(view, "box_clip") class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "Mesh Display" + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "Mesh Display" def poll(self, context): editmesh = context.mode == 'EDIT_MESH' @@ -1313,9 +1313,9 @@ class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel): col.itemR(mesh, "draw_face_area") class VIEW3D_PT_3dview_curvedisplay(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "Curve Display" + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "Curve Display" def poll(self, context): editmesh = context.mode == 'EDIT_CURVE' @@ -1333,10 +1333,10 @@ class VIEW3D_PT_3dview_curvedisplay(bpy.types.Panel): col.itemR(context.scene.tool_settings, "normal_size", text="Normal Size") class VIEW3D_PT_background_image(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "Background Image" - __default_closed__ = True + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "Background Image" + bl_default_closed = True def poll(self, context): view = context.space_data @@ -1371,10 +1371,10 @@ class VIEW3D_PT_background_image(bpy.types.Panel): col.itemR(bg, "offset_y", text="Y") class VIEW3D_PT_transform_orientations(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "Transform Orientations" - __default_closed__ = True + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "Transform Orientations" + bl_default_closed = True def poll(self, context): view = context.space_data @@ -1397,10 +1397,10 @@ class VIEW3D_PT_transform_orientations(bpy.types.Panel): col.itemO("tfm.delete_orientation", text="Delete") class VIEW3D_PT_etch_a_ton(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'UI' - __label__ = "Skeleton Sketching" - __default_closed__ = True + bl_space_type = 'VIEW_3D' + bl_region_type = 'UI' + bl_label = "Skeleton Sketching" + bl_default_closed = True def poll(self, context): scene = context.space_data @@ -1442,11 +1442,11 @@ class VIEW3D_PT_etch_a_ton(bpy.types.Panel): class OBJECT_OT_select_pattern(bpy.types.Operator): '''Select object matching a naming pattern.''' - __idname__ = "object.select_pattern" - __label__ = "Select Pattern" - __register__ = True - __undo__ = True - __props__ = [ + bl_idname = "object.select_pattern" + bl_label = "Select Pattern" + bl_register = True + bl_undo = True + bl_props = [ bpy.props.StringProperty(attr="pattern", name="Pattern", description="Name filter using '*' and '?' wildcard chars", maxlen= 32, default= "*"), bpy.props.BoolProperty(attr="case_sensitive", name="Case Sensitive", description="Do a case sensitive compare", default= False), bpy.props.BoolProperty(attr="extend", name="Extend", description="Extend the existing selection", default= True), diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index 1b80a35b504..df4cf6dcbaf 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -2,14 +2,14 @@ import bpy class View3DPanel(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'TOOLS' + bl_space_type = 'VIEW_3D' + bl_region_type = 'TOOLS' # ********** default tools for objectmode **************** class VIEW3D_PT_tools_objectmode(View3DPanel): - __context__ = "objectmode" - __label__ = "Object Tools" + bl_context = "objectmode" + bl_label = "Object Tools" def draw(self, context): layout = self.layout @@ -53,8 +53,8 @@ class VIEW3D_PT_tools_objectmode(View3DPanel): # ********** default tools for editmode_mesh **************** class VIEW3D_PT_tools_meshedit(View3DPanel): - __context__ = "mesh_edit" - __label__ = "Mesh Tools" + bl_context = "mesh_edit" + bl_label = "Mesh Tools" def draw(self, context): layout = self.layout @@ -104,8 +104,8 @@ class VIEW3D_PT_tools_meshedit(View3DPanel): col.itemO("screen.redo_last", text="Tweak...") class VIEW3D_PT_tools_meshedit_options(View3DPanel): - __context__ = "mesh_edit" - __label__ = "Mesh Options" + bl_context = "mesh_edit" + bl_label = "Mesh Options" def draw(self, context): layout = self.layout @@ -118,8 +118,8 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel): # ********** default tools for editmode_curve **************** class VIEW3D_PT_tools_curveedit(View3DPanel): - __context__ = "curve_edit" - __label__ = "Curve Tools" + bl_context = "curve_edit" + bl_label = "Curve Tools" def draw(self, context): layout = self.layout @@ -165,8 +165,8 @@ class VIEW3D_PT_tools_curveedit(View3DPanel): # ********** default tools for editmode_surface **************** class VIEW3D_PT_tools_surfaceedit(View3DPanel): - __context__ = "surface_edit" - __label__ = "Surface Tools" + bl_context = "surface_edit" + bl_label = "Surface Tools" def draw(self, context): layout = self.layout @@ -204,8 +204,8 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel): # ********** default tools for editmode_text **************** class VIEW3D_PT_tools_textedit(View3DPanel): - __context__ = "text_edit" - __label__ = "Text Tools" + bl_context = "text_edit" + bl_label = "Text Tools" def draw(self, context): layout = self.layout @@ -230,8 +230,8 @@ class VIEW3D_PT_tools_textedit(View3DPanel): # ********** default tools for editmode_armature **************** class VIEW3D_PT_tools_armatureedit(View3DPanel): - __context__ = "armature_edit" - __label__ = "Armature Tools" + bl_context = "armature_edit" + bl_label = "Armature Tools" def draw(self, context): layout = self.layout @@ -265,8 +265,8 @@ class VIEW3D_PT_tools_armatureedit(View3DPanel): col.itemO("screen.redo_last", text="Tweak...") class VIEW3D_PT_tools_armatureedit_options(View3DPanel): - __context__ = "armature_edit" - __label__ = "Armature Options" + bl_context = "armature_edit" + bl_label = "Armature Options" def draw(self, context): layout = self.layout @@ -279,8 +279,8 @@ class VIEW3D_PT_tools_armatureedit_options(View3DPanel): # ********** default tools for editmode_mball **************** class VIEW3D_PT_tools_mballedit(View3DPanel): - __context__ = "mball_edit" - __label__ = "Meta Tools" + bl_context = "mball_edit" + bl_label = "Meta Tools" def draw(self, context): layout = self.layout @@ -306,8 +306,8 @@ class VIEW3D_PT_tools_mballedit(View3DPanel): # ********** default tools for editmode_lattice **************** class VIEW3D_PT_tools_latticeedit(View3DPanel): - __context__ = "lattice_edit" - __label__ = "Lattice Tools" + bl_context = "lattice_edit" + bl_label = "Lattice Tools" def draw(self, context): layout = self.layout @@ -333,8 +333,8 @@ class VIEW3D_PT_tools_latticeedit(View3DPanel): # ********** default tools for posemode **************** class VIEW3D_PT_tools_posemode(View3DPanel): - __context__ = "posemode" - __label__ = "Pose Tools" + bl_context = "posemode" + bl_label = "Pose Tools" def draw(self, context): layout = self.layout @@ -381,8 +381,8 @@ class VIEW3D_PT_tools_posemode(View3DPanel): col.itemO("screen.redo_last", text="Tweak...") class VIEW3D_PT_tools_posemode_options(View3DPanel): - __context__ = "posemode" - __label__ = "Pose Options" + bl_context = "posemode" + bl_label = "Pose Options" def draw(self, context): layout = self.layout @@ -396,8 +396,8 @@ class VIEW3D_PT_tools_posemode_options(View3DPanel): # ********** default tools for paint modes **************** class PaintPanel(bpy.types.Panel): - __space_type__ = 'VIEW_3D' - __region_type__ = 'TOOLS' + bl_space_type = 'VIEW_3D' + bl_region_type = 'TOOLS' def paint_settings(self, context): ts = context.tool_settings @@ -416,7 +416,7 @@ class PaintPanel(bpy.types.Panel): return False class VIEW3D_PT_tools_brush(PaintPanel): - __label__ = "Brush" + bl_label = "Brush" def poll(self, context): return self.paint_settings(context) @@ -555,8 +555,8 @@ class VIEW3D_PT_tools_brush(PaintPanel): ''' class VIEW3D_PT_tools_brush_stroke(PaintPanel): - __label__ = "Stroke" - __default_closed__ = True + bl_label = "Stroke" + bl_default_closed = True def poll(self, context): settings = self.paint_settings(context) @@ -597,8 +597,8 @@ class VIEW3D_PT_tools_brush_stroke(PaintPanel): row.itemR(brush, "use_spacing_pressure", toggle=True, text="") class VIEW3D_PT_tools_brush_curve(PaintPanel): - __label__ = "Curve" - __default_closed__ = True + bl_label = "Curve" + bl_default_closed = True def poll(self, context): settings = self.paint_settings(context) @@ -614,7 +614,7 @@ class VIEW3D_PT_tools_brush_curve(PaintPanel): layout.item_menu_enumO("brush.curve_preset", property="shape") class VIEW3D_PT_sculpt_options(PaintPanel): - __label__ = "Options" + bl_label = "Options" def poll(self, context): return context.sculpt_object @@ -645,8 +645,8 @@ class VIEW3D_PT_sculpt_options(PaintPanel): # ********** default tools for weightpaint **************** class VIEW3D_PT_tools_weightpaint(View3DPanel): - __context__ = "weightpaint" - __label__ = "Weight Tools" + bl_context = "weightpaint" + bl_label = "Weight Tools" def draw(self, context): layout = self.layout @@ -661,8 +661,8 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel): col.itemO("object.vertex_group_clean", text="Clean") class VIEW3D_PT_tools_weightpaint_options(View3DPanel): - __context__ = "weightpaint" - __label__ = "Options" + bl_context = "weightpaint" + bl_label = "Options" def draw(self, context): layout = self.layout @@ -694,8 +694,8 @@ class VIEW3D_PT_tools_weightpaint_options(View3DPanel): # ********** default tools for vertexpaint **************** class VIEW3D_PT_tools_vertexpaint(View3DPanel): - __context__ = "vertexpaint" - __label__ = "Options" + bl_context = "vertexpaint" + bl_label = "Options" def draw(self, context): layout = self.layout @@ -719,8 +719,8 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel): # ********** default tools for texturepaint **************** class VIEW3D_PT_tools_projectpaint(View3DPanel): - __context__ = "texturepaint" - __label__ = "Project Paint" + bl_context = "texturepaint" + bl_label = "Project Paint" def poll(self, context): return context.tool_settings.image_paint.tool != 'SMEAR' @@ -774,8 +774,8 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel): # ********** default tools for particle mode **************** class VIEW3D_PT_tools_particlemode(View3DPanel): - __context__ = "particlemode" - __label__ = "Options" + bl_context = "particlemode" + bl_label = "Options" def draw(self, context): layout = self.layout |