From 9ff1e5eca76413b0f178ead688e9cde1c1385e36 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Mon, 3 Sep 2018 19:02:42 +0200
Subject: [PATCH] 2.8: update for x_ray and draw/display renaming.
---
add_advanced_objects_menu/mesh_easylattice.py | 2 +-
add_advanced_objects_menu/rope_alpha.py | 2 +-
add_advanced_objects_menu/scene_objects_bi.py | 2 +-
.../scene_objects_cycles.py | 2 +-
.../scene_texture_render.py | 2 +-
.../object_laplace_lightning.py | 2 +-
.../unfold_transition.py | 4 +-
.../add_curve_spirofit_bouncespline.py | 2 +-
add_curve_sapling/utils.py | 6 +--
add_mesh_extra_objects/add_empty_as_parent.py | 2 +-
archimesh/achm_door_maker.py | 4 +-
archimesh/achm_window_maker.py | 2 +-
archimesh/achm_window_panel.py | 2 +-
archipack/archipack_autoboolean.py | 2 +-
archipack/archipack_gl.py | 3 +-
archipack/archipack_wall2.py | 2 +-
camera_dolly_crane_rigs.py | 12 ++---
camera_turnaround.py | 2 +-
io_anim_acclaim/__init__.py | 2 +-
io_anim_bvh/import_bvh.py | 4 +-
io_anim_c3d/__init__.py | 4 +-
io_anim_camera.py | 2 +-
io_import_dxf/dxfimport/do.py | 2 +-
io_scene_fbx/export_fbx_bin.py | 6 +--
io_scene_ms3d/ms3d_import.py | 4 +-
io_scene_x3d/import_x3d.py | 4 +-
light_field_tools/light_field_tools.py | 2 +-
measureit/measureit_main.py | 2 +-
mesh_carver.py | 46 +++++++++----------
modules/rna_manual_reference.py | 2 +-
object_boolean_tools.py | 16 +++----
object_cloud_gen.py | 16 +++----
object_fracture_cell/__init__.py | 6 +--
render_povray/render.py | 6 +--
rigify/generate.py | 4 +-
rigify/legacy/generate.py | 2 +-
space_view3d_copy_attributes.py | 10 ++--
space_view3d_display_tools/__init__.py | 8 ++--
space_view3d_display_tools/display.py | 12 ++---
space_view3d_display_tools/fast_navigate.py | 16 +++----
space_view3d_spacebar_menu.py | 22 ++++-----
ui_layer_manager.py | 4 +-
42 files changed, 128 insertions(+), 129 deletions(-)
diff --git a/add_advanced_objects_menu/mesh_easylattice.py b/add_advanced_objects_menu/mesh_easylattice.py
index 9a43474c5..78f3d0207 100644
--- a/add_advanced_objects_menu/mesh_easylattice.py
+++ b/add_advanced_objects_menu/mesh_easylattice.py
@@ -63,7 +63,7 @@ def createLattice(context, obj, props):
# the rotation comes from the combined obj world
# matrix which was converted to euler pairs
ob.rotation_euler = buildRot_World(obj)
- ob.show_x_ray = True
+ ob.show_in_front = True
# Link object to scene
scn = context.scene
diff --git a/add_advanced_objects_menu/rope_alpha.py b/add_advanced_objects_menu/rope_alpha.py
index 904168a1e..4ef23fc15 100644
--- a/add_advanced_objects_menu/rope_alpha.py
+++ b/add_advanced_objects_menu/rope_alpha.py
@@ -622,7 +622,7 @@ class BallRope(Operator):
bpy.ops.rigidbody.objects_add(type='ACTIVE')
bpy.context.object.name = "CubeLink"
if n != 0:
- bpy.context.object.draw_type = 'WIRE'
+ bpy.context.object.display_type = 'WIRE'
bpy.context.object.hide_render = True
n += 1
bpy.context.object.scale.z = (longitud * 2) / (segmentos * 2) - separation
diff --git a/add_advanced_objects_menu/scene_objects_bi.py b/add_advanced_objects_menu/scene_objects_bi.py
index f8afd906d..94bda4bc5 100644
--- a/add_advanced_objects_menu/scene_objects_bi.py
+++ b/add_advanced_objects_menu/scene_objects_bi.py
@@ -43,7 +43,7 @@ class add_BI_scene(Operator):
)
cam = bpy.context.active_object.data
cam.lens = 35
- cam.draw_size = 0.1
+ cam.display_size = 0.1
bpy.ops.view3d.viewnumpad(type='CAMERA')
# add point lamp
diff --git a/add_advanced_objects_menu/scene_objects_cycles.py b/add_advanced_objects_menu/scene_objects_cycles.py
index b68317915..7158b02f1 100644
--- a/add_advanced_objects_menu/scene_objects_cycles.py
+++ b/add_advanced_objects_menu/scene_objects_cycles.py
@@ -43,7 +43,7 @@ class add_cycles_scene(Operator):
)
cam = bpy.context.active_object.data
cam.lens = 35
- cam.draw_size = 0.1
+ cam.display_size = 0.1
bpy.ops.view3d.viewnumpad(type='CAMERA')
# add point lamp
diff --git a/add_advanced_objects_menu/scene_texture_render.py b/add_advanced_objects_menu/scene_texture_render.py
index 02d6490bb..0f9ccc2b3 100644
--- a/add_advanced_objects_menu/scene_texture_render.py
+++ b/add_advanced_objects_menu/scene_texture_render.py
@@ -43,7 +43,7 @@ class add_texture_scene(Operator):
)
cam = bpy.context.active_object.data
cam.lens = 35
- cam.draw_size = 0.1
+ cam.display_size = 0.1
# add plane
bpy.ops.mesh.primitive_plane_add(enter_editmode=True, location=(0, 0, 0))
diff --git a/add_advanced_objects_panels/object_laplace_lightning.py b/add_advanced_objects_panels/object_laplace_lightning.py
index f33ed935f..f653de53d 100644
--- a/add_advanced_objects_panels/object_laplace_lightning.py
+++ b/add_advanced_objects_panels/object_laplace_lightning.py
@@ -1087,7 +1087,7 @@ def setupObjects():
bpy.context.scene.objects.link(oOB)
gOB = bpy.data.objects.new('ELground', None)
- gOB.empty_draw_type = 'ARROWS'
+ gOB.empty_display_type = 'ARROWS'
bpy.context.scene.objects.link(gOB)
cME = makeMeshCube(1)
diff --git a/add_advanced_objects_panels/unfold_transition.py b/add_advanced_objects_panels/unfold_transition.py
index 42d8c3ba5..44051bf0e 100644
--- a/add_advanced_objects_panels/unfold_transition.py
+++ b/add_advanced_objects_panels/unfold_transition.py
@@ -129,8 +129,8 @@ class Set_Up_Fold(Operator):
scn.objects.link(rig)
scn.objects.active = rig
bpy.ops.object.mode_set(mode="EDIT")
- arm.draw_type = "WIRE"
- rig.show_x_ray = True
+ arm.display_type = "WIRE"
+ rig.show_in_front = True
mod = obj.modifiers.new("UnFold", "ARMATURE")
mod.show_in_editmode = True
mod.object = rig
diff --git a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
index d0c1c747a..5219bc314 100644
--- a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
+++ b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
@@ -933,7 +933,7 @@ def add_curve_object(
bpy.context.scene.objects.active = cur
cur.select = True
if x_ray is True:
- cur.show_x_ray = x_ray
+ cur.show_in_front = x_ray
return
diff --git a/add_curve_sapling/utils.py b/add_curve_sapling/utils.py
index af23e434e..00949a81e 100644
--- a/add_curve_sapling/utils.py
+++ b/add_curve_sapling/utils.py
@@ -735,13 +735,13 @@ def create_armature(armAnim, leafP, cu, frameRate, leafMesh, leafObj, leafVertSi
newAction = bpy.data.actions.new(name='windAction')
armOb.animation_data_create()
armOb.animation_data.action = newAction
- arm.draw_type = 'STICK'
+ arm.display_type = 'STICK'
arm.use_deform_delay = True
# Add the armature modifier to the curve
armMod = treeOb.modifiers.new('windSway', 'ARMATURE')
if previewArm:
armMod.show_viewport = False
- arm.draw_type = 'WIRE'
+ arm.display_type = 'WIRE'
treeOb.hide = True
armMod.use_apply_on_spline = True
armMod.object = armOb
@@ -1996,7 +1996,7 @@ def addTree(props):
armMod = treeObj.modifiers.new('windSway', 'ARMATURE')
if previewArm:
bpy.data.objects['treeArm'].hide = True
- bpy.data.armatures['tree'].draw_type = 'STICK'
+ bpy.data.armatures['tree'].display_type = 'STICK'
armMod.object = bpy.data.objects['treeArm']
armMod.use_bone_envelopes = False
armMod.use_vertex_groups = True
diff --git a/add_mesh_extra_objects/add_empty_as_parent.py b/add_mesh_extra_objects/add_empty_as_parent.py
index bcaecf64a..32d0d1679 100644
--- a/add_mesh_extra_objects/add_empty_as_parent.py
+++ b/add_mesh_extra_objects/add_empty_as_parent.py
@@ -78,7 +78,7 @@ class P2E(Operator):
bpy.ops.object.add(type='EMPTY', location=loc)
context.object.name = self.nombre
context.object.show_name = True
- context.object.show_x_ray = True
+ context.object.show_in_front = True
if self.grupo:
bpy.ops.group.create(name=self.nombre)
diff --git a/archimesh/achm_door_maker.py b/archimesh/achm_door_maker.py
index 6d048bfdc..4ef993733 100644
--- a/archimesh/achm_door_maker.py
+++ b/archimesh/achm_door_maker.py
@@ -233,7 +233,7 @@ def shape_children(mainobject, update=False):
myctrl.location.x = 0
myctrl.location.y = -((mp.frame_thick * 3) / 2)
myctrl.location.z = -gap
- myctrl.draw_type = 'BOUNDS'
+ myctrl.display_type = 'BOUNDS'
myctrl.hide = False
myctrl.hide_render = True
if bpy.context.scene.render.engine == 'CYCLES':
@@ -256,7 +256,7 @@ def shape_children(mainobject, update=False):
myctrlbase.location.x = 0
myctrlbase.location.y = -0.15 - (mp.frame_thick / 3)
myctrlbase.location.z = -0.10
- myctrlbase.draw_type = 'BOUNDS'
+ myctrlbase.display_type = 'BOUNDS'
myctrlbase.hide = False
myctrlbase.hide_render = True
if bpy.context.scene.render.engine == 'CYCLES':
diff --git a/archimesh/achm_window_maker.py b/archimesh/achm_window_maker.py
index 5095f47ef..dd12b4b44 100644
--- a/archimesh/achm_window_maker.py
+++ b/archimesh/achm_window_maker.py
@@ -216,7 +216,7 @@ def shape_mesh_and_create_children(mainobject, tmp_mesh, update=False):
myctrl.location.x = 0
myctrl.location.y = -mp.depth * 3 / 2
myctrl.location.z = 0
- myctrl.draw_type = 'BOUNDS'
+ myctrl.display_type = 'BOUNDS'
myctrl.hide = False
myctrl.hide_render = True
if bpy.context.scene.render.engine == 'CYCLES':
diff --git a/archimesh/achm_window_panel.py b/archimesh/achm_window_panel.py
index 592e13a66..859f8f9a1 100644
--- a/archimesh/achm_window_panel.py
+++ b/archimesh/achm_window_panel.py
@@ -394,7 +394,7 @@ def do_ctrl_box(myobject):
myctrl.location.x = 0
myctrl.location.y = 0
myctrl.location.z = 0
- myctrl.draw_type = 'WIRE'
+ myctrl.display_type = 'WIRE'
myctrl.hide = False
myctrl.hide_render = True
if bpy.context.scene.render.engine == 'CYCLES':
diff --git a/archipack/archipack_autoboolean.py b/archipack/archipack_autoboolean.py
index 93e9bc984..43a677b4c 100644
--- a/archipack/archipack_autoboolean.py
+++ b/archipack/archipack_autoboolean.py
@@ -105,7 +105,7 @@ class ArchipackBoolManager():
hole.lock_location = (True, True, True)
hole.lock_rotation = (True, True, True)
hole.lock_scale = (True, True, True)
- hole.draw_type = 'WIRE'
+ hole.display_type = 'WIRE'
hole.hide_render = True
hole.hide_select = True
hole.select = True
diff --git a/archipack/archipack_gl.py b/archipack/archipack_gl.py
index c50c61a26..e8182feda 100644
--- a/archipack/archipack_gl.py
+++ b/archipack/archipack_gl.py
@@ -849,8 +849,7 @@ class Screen():
y_max = h - self.margin
x_min = self.margin
x_max = w - self.margin
- if (system.use_region_overlap and
- system.window_draw_method in {'TRIPLE_BUFFER', 'AUTOMATIC'}):
+ if system.use_region_overlap:
area = context.area
for r in area.regions:
diff --git a/archipack/archipack_wall2.py b/archipack/archipack_wall2.py
index 92172eb17..551e87f61 100644
--- a/archipack/archipack_wall2.py
+++ b/archipack/archipack_wall2.py
@@ -1672,7 +1672,7 @@ class ARCHIPACK_OT_wall2_throttle_update(Operator):
m = o.modifiers.get("AutoBoolean")
if m is not None:
o.hide = False
- # o.draw_type = 'TEXTURED'
+ # o.display_type = 'TEXTURED'
# m.show_viewport = True
return self.cancel(context)
diff --git a/camera_dolly_crane_rigs.py b/camera_dolly_crane_rigs.py
index c3f40de97..0eceebf3e 100644
--- a/camera_dolly_crane_rigs.py
+++ b/camera_dolly_crane_rigs.py
@@ -533,7 +533,7 @@ def build_dolly_rig(context):
cam.data.name = "Dolly_Camera.000"
cam_data_name = bpy.context.object.data.name
- bpy.data.cameras[cam_data_name].draw_size = 1.0
+ bpy.data.cameras[cam_data_name].display_size = 1.0
cam.rotation_euler[0] = 1.5708 # rotate the camera 90 degrees in x
cam.location = (0.0, -2.0, 0.0) # move the camera to the correct postion
cam.parent = rig
@@ -631,9 +631,9 @@ def build_crane_rig(context):
ctrlAimChild.parent = ctrlAim
# change display to BBone: it just looks nicer
- bpy.context.object.data.draw_type = 'BBONE'
+ bpy.context.object.data.display_type = 'BBONE'
# change display to wire for object
- bpy.context.object.draw_type = 'WIRE'
+ bpy.context.object.display_type = 'WIRE'
# jump into pose mode and change bones to euler
bpy.ops.object.mode_set(mode='POSE')
@@ -718,7 +718,7 @@ def build_crane_rig(context):
cam.data.name = "Crane_Camera.000"
cam_data_name = bpy.context.object.data.name
- bpy.data.cameras[cam_data_name].draw_size = 1.0
+ bpy.data.cameras[cam_data_name].display_size = 1.0
cam.rotation_euler[0] = 1.5708 # rotate the camera 90 degrees in x
cam.location = (0.0, -2.0, 0.0) # move the camera to the correct postion
cam.parent = rig
@@ -801,7 +801,7 @@ class DollyCameraUI(Panel):
text="Make Active Camera", icon='CAMERA_DATA')
col.prop(context.active_object,
- 'show_x_ray', toggle=False, text='X Ray')
+ 'show_in_front', toggle=False, text='X Ray')
col.prop(cam, "show_limits")
col.prop(cam, "show_safe_areas")
col.prop(cam, "show_passepartout")
@@ -865,7 +865,7 @@ class CraneCameraUI(Panel):
col.operator(
"scene.make_camera_active", text="Make Active Camera", icon='CAMERA_DATA')
col.prop(
- context.active_object, 'show_x_ray', toggle=False, text='X Ray')
+ context.active_object, 'show_in_front', toggle=False, text='X Ray')
col.prop(cam, "show_limits")
col.prop(cam, "show_safe_areas")
col.prop(cam, "show_passepartout")
diff --git a/camera_turnaround.py b/camera_turnaround.py
index 6a6e710f5..547c2834c 100644
--- a/camera_turnaround.py
+++ b/camera_turnaround.py
@@ -96,7 +96,7 @@ class RunAction(Operator):
context.user_preferences.edit.keyframe_new_interpolation_type = 'LINEAR'
# create first frame
myempty.rotation_euler = (0, 0, 0)
- myempty.empty_draw_size = 0.1
+ myempty.empty_display_size = 0.1
context.scene.frame_set(scene.frame_start)
myempty.keyframe_insert(data_path='rotation_euler', frame=scene.frame_start)
diff --git a/io_anim_acclaim/__init__.py b/io_anim_acclaim/__init__.py
index b65d945cc..7cada817f 100644
--- a/io_anim_acclaim/__init__.py
+++ b/io_anim_acclaim/__init__.py
@@ -189,7 +189,7 @@ class StructureBuilder(DataStructure):
self.armature = self.object.data
self.object.name = self.name
self.armature.name = self.name
- self.armature.draw_type = 'STICK'
+ self.armature.display_type = 'STICK'
self.object['source_file_path'] = self.file_path
self.object['source_scale'] = self.user_def_scale
self.object['MhxArmature'] = 'Daz'
diff --git a/io_anim_bvh/import_bvh.py b/io_anim_bvh/import_bvh.py
index df733a73e..e7cbd7791 100644
--- a/io_anim_bvh/import_bvh.py
+++ b/io_anim_bvh/import_bvh.py
@@ -319,8 +319,8 @@ def bvh_node_dict2objects(context, bvh_name, bvh_nodes, rotate_mode='NATIVE', fr
obj.select = True
# nicer drawing.
- obj.empty_draw_type = 'CUBE'
- obj.empty_draw_size = 0.1
+ obj.empty_display_type = 'CUBE'
+ obj.empty_display_size = 0.1
return obj
diff --git a/io_anim_c3d/__init__.py b/io_anim_c3d/__init__.py
index dfa5238d5..e14fcaec7 100644
--- a/io_anim_c3d/__init__.py
+++ b/io_anim_c3d/__init__.py
@@ -272,7 +272,7 @@ class C3DImporter(bpy.types.Operator):
unames[name] = o.name
bpy.ops.transform.resize(value=empty_size)
o.show_name = self.properties.show_names
- o.show_x_ray = self.properties.x_ray
+ o.show_in_front = self.properties.x_ray
for name in unames.values():
bpy.context.scene.objects[name].select = True
return unames
@@ -291,7 +291,7 @@ class C3DImporter(bpy.types.Operator):
arm = bpy.context.active_object
arm.name = os.path.basename(self.properties.filepath)
arm.data.show_names = self.properties.show_names
- arm.show_x_ray = self.properties.x_ray
+ arm.show_in_front = self.properties.x_ray
for idx, ml in enumerate(ms.markerLabels):
name = self.properties.prefix + ml
bpy.ops.armature.select_all(action='DESELECT')
diff --git a/io_anim_camera.py b/io_anim_camera.py
index 374e88f40..dff68096d 100644
--- a/io_anim_camera.py
+++ b/io_anim_camera.py
@@ -45,7 +45,7 @@ def write_cameras(context, filepath, frame_start, frame_end, only_selected=False
'dof_distance',
'clip_start',
'clip_end',
- 'draw_size',
+ 'display_size',
)
obj_attrs = (
diff --git a/io_import_dxf/dxfimport/do.py b/io_import_dxf/dxfimport/do.py
index 117faedee..0bc8667b9 100644
--- a/io_import_dxf/dxfimport/do.py
+++ b/io_import_dxf/dxfimport/do.py
@@ -1005,7 +1005,7 @@ class Do:
bpy.context.screen.scene = scene
o = bbox.copy()
- # o.empty_draw_size = 0.3
+ # o.empty_display_size = 0.3
o.dupli_type = "GROUP"
o.dupli_group = block_group
group.objects.link(o)
diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py
index e01dd8234..09638c5d0 100644
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@ -2073,13 +2073,13 @@ def fbx_animations(scene_data):
'delta_location', 'delta_rotation_euler', 'delta_rotation_quaternion', 'delta_scale',
'lock_location', 'lock_rotation', 'lock_rotation_w', 'lock_rotations_4d', 'lock_scale',
'tag', 'layers', 'select', 'track_axis', 'up_axis', 'active_material', 'active_material_index',
- 'matrix_parent_inverse', 'empty_draw_type', 'empty_draw_size', 'empty_image_offset', 'pass_index',
+ 'matrix_parent_inverse', 'empty_display_type', 'empty_display_size', 'empty_image_offset', 'pass_index',
'color', 'hide', 'hide_select', 'hide_render', 'use_slow_parent', 'slow_parent_offset',
'use_extra_recalc_object', 'use_extra_recalc_data', 'dupli_type', 'use_dupli_frames_speed',
'use_dupli_vertices_rotation', 'use_dupli_faces_scale', 'dupli_faces_scale', 'dupli_group',
'dupli_frames_start', 'dupli_frames_end', 'dupli_frames_on', 'dupli_frames_off',
- 'draw_type', 'show_bounds', 'draw_bounds_type', 'show_name', 'show_axis', 'show_texture_space',
- 'show_wire', 'show_all_edges', 'show_transparent', 'show_x_ray',
+ 'display_type', 'show_bounds', 'display_bounds_type', 'show_name', 'show_axis', 'show_texture_space',
+ 'show_wire', 'show_all_edges', 'show_transparent', 'show_in_front',
'show_only_shape_key', 'use_shape_key_edit_mode', 'active_shape_key_index',
)
for p in props:
diff --git a/io_scene_ms3d/ms3d_import.py b/io_scene_ms3d/ms3d_import.py
index a2205556a..9a6fb42f8 100644
--- a/io_scene_ms3d/ms3d_import.py
+++ b/io_scene_ms3d/ms3d_import.py
@@ -690,14 +690,14 @@ class Ms3dImporter():
blender_armature = blender_context.blend_data.armatures.new(
ms3d_armature_name)
blender_armature.ms3d.name = ms3d_model.name
- blender_armature.draw_type = 'STICK'
+ blender_armature.display_type = 'STICK'
blender_armature.show_axes = True
blender_armature.use_auto_ik = True
blender_armature_object = blender_context.blend_data.objects.new(
ms3d_armature_object_name, blender_armature)
blender_scene.objects.link(blender_armature_object)
#blender_armature_object.location = blender_scene.cursor_location
- blender_armature_object.show_x_ray = True
+ blender_armature_object.show_in_front = True
##########################
# create new modifier
diff --git a/io_scene_x3d/import_x3d.py b/io_scene_x3d/import_x3d.py
index cffdabfeb..1929d3448 100644
--- a/io_scene_x3d/import_x3d.py
+++ b/io_scene_x3d/import_x3d.py
@@ -3271,8 +3271,8 @@ def importTransform(bpyscene, node, ancestry, global_matrix):
bpyob.matrix_world = getFinalMatrix(node, None, ancestry, global_matrix)
# so they are not too annoying
- bpyob.empty_draw_type = 'PLAIN_AXES'
- bpyob.empty_draw_size = 0.2
+ bpyob.empty_display_type = 'PLAIN_AXES'
+ bpyob.empty_display_size = 0.2
#def importTimeSensor(node):
diff --git a/light_field_tools/light_field_tools.py b/light_field_tools/light_field_tools.py
index f6d57c298..c2ce7a884 100644
--- a/light_field_tools/light_field_tools.py
+++ b/light_field_tools/light_field_tools.py
@@ -189,7 +189,7 @@ class OBJECT_OT_create_lightfield_rig(Operator):
cam.data.angle = scene.lightfield.angle
# display options of the camera
- cam.data.draw_size = 0.15
+ cam.data.display_size = 0.15
cam.data.lens_unit = 'FOV'
# handler parent
diff --git a/measureit/measureit_main.py b/measureit/measureit_main.py
index c726cff85..4b40ac60c 100644
--- a/measureit/measureit_main.py
+++ b/measureit/measureit_main.py
@@ -1892,7 +1892,7 @@ class AddNoteButton(Operator):
bpy.ops.object.empty_add(type='PLAIN_AXES')
myempty = bpy.data.objects[bpy.context.active_object.name]
myempty.location = bpy.context.scene.cursor_location
- myempty.empty_draw_size = 0.01
+ myempty.empty_display_size = 0.01
myempty.name = "Annotation"
# Add properties
scene = context.scene
diff --git a/mesh_carver.py b/mesh_carver.py
index fc1b25010..32e6f74cc 100644
--- a/mesh_carver.py
+++ b/mesh_carver.py
@@ -1964,12 +1964,12 @@ def duplicateObject(self):
ob_new.rotation_quaternion = qRot
ob_new.rotation_mode = 'XYZ'
- if (ob_new.draw_type == "WIRE") and (self.BrushSolidify is False):
+ if (ob_new.display_type == "WIRE") and (self.BrushSolidify is False):
ob_new.hide = True
if self.BrushSolidify:
- ob_new.draw_type = "SOLID"
- ob_new.show_x_ray = False
+ ob_new.display_type = "SOLID"
+ ob_new.show_in_front = False
for o in bpy.context.selected_objects:
UndoAdd(self, "DUPLICATE", o)
@@ -2070,20 +2070,20 @@ def boolean_operation(bool_type="DIFFERENCE"):
)
BoolMod.object = bpy.context.selected_objects[sel_index]
BoolMod.operation = bool_type
- bpy.context.selected_objects[sel_index].draw_type = 'WIRE'
+ bpy.context.selected_objects[sel_index].display_type = 'WIRE'
def Rebool(context, self):
LastObj = context.active_object
Brush = context.selected_objects[0]
- Brush.draw_type = "WIRE"
+ Brush.display_type = "WIRE"
obj = context.selected_objects[1]
bpy.ops.object.select_all(action='TOGGLE')
context.scene.objects.active = obj
- obj.draw_type = "SOLID"
+ obj.display_type = "SOLID"
obj.select = True
bpy.ops.object.duplicate_move(
OBJECT_OT_duplicate={
@@ -2124,7 +2124,7 @@ def Rebool(context, self):
mb.show_viewport = False
if self.ObjectBrush or self.ProfileBrush:
- LastObjectCreated.show_x_ray = False
+ LastObjectCreated.show_in_front = False
try:
bpy.ops.object.modifier_apply(apply_as='DATA', modifier="CT_SOLIDIFY")
except:
@@ -2177,7 +2177,7 @@ def createMeshFromData(self):
scn.objects.active = ob
ob.select = True
ob.location = Vector((10000.0, 0.0, 0.0))
- ob.draw_type = "WIRE"
+ ob.display_type = "WIRE"
self.SolidifyPossible = True
else:
@@ -2390,7 +2390,7 @@ class Carver(bpy.types.Operator):
self.ProfileBrush.select = True
context.scene.objects.active = self.ProfileBrush
# Set xRay
- self.ProfileBrush.show_x_ray = True
+ self.ProfileBrush.show_in_front = True
bpy.ops.object.modifier_add(type='SOLIDIFY')
context.object.modifiers["Solidify"].name = "CT_SOLIDIFY"
@@ -2407,8 +2407,8 @@ class Carver(bpy.types.Operator):
self.ObjectBrush.scale = self.InitBrushScale
self.ObjectBrush.rotation_quaternion = self.InitBrushQRotation
self.ObjectBrush.rotation_euler = self.InitBrushERotation
- self.ObjectBrush.draw_type = self.ObjectBrush_DT
- self.ObjectBrush.show_x_ray = self.XRay
+ self.ObjectBrush.display_type = self.ObjectBrush_DT
+ self.ObjectBrush.show_in_front = self.XRay
# Remove solidify modifier
Selection_Save(self)
@@ -2430,7 +2430,7 @@ class Carver(bpy.types.Operator):
self.ObjectBrush.select = True
context.scene.objects.active = self.ObjectBrush
# Set xRay
- self.ObjectBrush.show_x_ray = True
+ self.ObjectBrush.show_in_front = True
bpy.ops.object.modifier_add(type='SOLIDIFY')
context.object.modifiers["Solidify"].name = "CT_SOLIDIFY"
context.object.modifiers["CT_SOLIDIFY"].thickness = 0.1
@@ -2529,12 +2529,12 @@ class Carver(bpy.types.Operator):
self.ObjectBrush.select = True
context.scene.objects.active = self.ObjectBrush
# Active le xray
- self.ObjectBrush.show_x_ray = True
+ self.ObjectBrush.show_in_front = True
else:
self.ProfileBrush.select = True
context.scene.objects.active = self.ProfileBrush
# Active le xray
- self.ProfileBrush.show_x_ray = True
+ self.ProfileBrush.show_in_front = True
bpy.ops.object.modifier_add(type='SOLIDIFY')
context.object.modifiers["Solidify"].name = "CT_SOLIDIFY"
@@ -2773,8 +2773,8 @@ class Carver(bpy.types.Operator):
self.ObjectBrush.scale = self.InitBrushScale
self.ObjectBrush.rotation_quaternion = self.InitBrushQRotation
self.ObjectBrush.rotation_euler = self.InitBrushERotation
- self.ObjectBrush.draw_type = self.ObjectBrush_DT
- self.ObjectBrush.show_x_ray = self.XRay
+ self.ObjectBrush.display_type = self.ObjectBrush_DT
+ self.ObjectBrush.show_in_front = self.XRay
# remove solidify
Selection_Save(self)
@@ -2844,8 +2844,8 @@ class Carver(bpy.types.Operator):
self.ObjectBrush.scale = self.InitBrushScale
self.ObjectBrush.rotation_quaternion = self.InitBrushQRotation
self.ObjectBrush.rotation_euler = self.InitBrushERotation
- self.ObjectBrush.draw_type = self.ObjectBrush_DT
- self.ObjectBrush.show_x_ray = self.XRay
+ self.ObjectBrush.display_type = self.ObjectBrush_DT
+ self.ObjectBrush.show_in_front = self.XRay
# Remove solidify modifier
Selection_Save(self)
@@ -3089,8 +3089,8 @@ class Carver(bpy.types.Operator):
self.InitBrushScale = self.ObjectBrush.scale.copy()
self.InitBrushQRotation = self.ObjectBrush.rotation_quaternion.copy()
self.InitBrushERotation = self.ObjectBrush.rotation_euler.copy()
- self.ObjectBrush_DT = self.ObjectBrush.draw_type
- self.XRay = self.ObjectBrush.show_x_ray
+ self.ObjectBrush_DT = self.ObjectBrush.display_type
+ self.XRay = self.ObjectBrush.show_in_front
# Test if flat object
z = self.ObjectBrush.data.vertices[0].co.z
ErrorMarge = 0.01
@@ -3363,7 +3363,7 @@ class Carver(bpy.types.Operator):
bpy.ops.object.delete(use_global=False)
else:
if self.ObjectMode:
- self.ObjectBrush.draw_type = self.ObjectBrush_DT
+ self.ObjectBrush.display_type = self.ObjectBrush_DT
if len(context.selected_objects) > 0:
bpy.ops.object.select_all(action='TOGGLE')
@@ -3392,9 +3392,9 @@ class Carver(bpy.types.Operator):
# If object has children, set "Wire" draw type
if self.ObjectBrush is not None:
if len(self.ObjectBrush.children) > 0:
- self.ObjectBrush.draw_type = "WIRE"
+ self.ObjectBrush.display_type = "WIRE"
if self.ProfileMode:
- self.ProfileBrush.draw_type = "WIRE"
+ self.ProfileBrush.display_type = "WIRE"
if bLocalView:
bpy.ops.view3d.localview()
diff --git a/modules/rna_manual_reference.py b/modules/rna_manual_reference.py
index a001346db..5f837c8bc 100644
--- a/modules/rna_manual_reference.py
+++ b/modules/rna_manual_reference.py
@@ -435,7 +435,7 @@ url_manual_mapping = (
("bpy.types.multicamsequence*", "editors/vse/sequencer/strips/effects/multicam.html#bpy-types-multicamsequence"),
("bpy.types.multiplysequence*", "editors/vse/sequencer/strips/effects/multiply.html#bpy-types-multiplysequence"),
("bpy.types.multiresmodifier*", "modeling/modifiers/generate/multiresolution.html#bpy-types-multiresmodifier"),
- ("bpy.types.object.draw_type*", "editors/3dview/object/properties/display.html#bpy-types-object-draw-type"),
+ ("bpy.types.object.display_type*", "editors/3dview/object/properties/display.html#bpy-types-object-draw-type"),
("bpy.types.object.use_extra*", "editors/3dview/object/properties/relations/extras.html#bpy-types-object-use-extra"),
("bpy.types.overdropsequence*", "editors/vse/sequencer/strips/effects/alpha_over_under_overdrop.html#bpy-types-overdropsequence"),
("bpy.types.particlesettings*", "physics/particles/index.html#bpy-types-particlesettings"),
diff --git a/object_boolean_tools.py b/object_boolean_tools.py
index df082abca..9829640d6 100644
--- a/object_boolean_tools.py
+++ b/object_boolean_tools.py
@@ -159,9 +159,9 @@ def Operation(context, _operation):
obj.modifiers.remove(mod)
"""
if useWire:
- selObj.draw_type = "WIRE"
+ selObj.display_type = "WIRE"
else:
- selObj.draw_type = "BOUNDS"
+ selObj.display_type = "BOUNDS"
cyclesVis.camera = False
cyclesVis.diffuse = False
@@ -200,7 +200,7 @@ def Remove(context, thisObj_name, Prop):
# if it's the brush object
if obj.name == _thisObj_name:
cyclesVis = obj.cycles_visibility
- obj.draw_type = "TEXTURED"
+ obj.display_type = "TEXTURED"
del obj["BoolToolBrush"]
del obj["BoolTool_FTransform"]
cyclesVis.camera = True
@@ -229,7 +229,7 @@ def Remove(context, thisObj_name, Prop):
if (actObj.name in mod.name):
Canvas.modifiers.remove(mod)
cyclesVis = actObj.cycles_visibility
- actObj.draw_type = "TEXTURED"
+ actObj.display_type = "TEXTURED"
del actObj["BoolToolBrush"]
del actObj["BoolTool_FTransform"]
cyclesVis.camera = True
@@ -509,9 +509,9 @@ class BTool_FastTransform(Operator):
if isBrush(actObj) and actObj["BoolTool_FTransform"] == "True":
EnableThisBrush(bpy.context, "False")
if useWire:
- actObj.draw_type = "WIRE"
+ actObj.display_type = "WIRE"
else:
- actObj.draw_type = "BOUNDS"
+ actObj.display_type = "BOUNDS"
if self.operator == "Translate":
bpy.ops.transform.translate('INVOKE_DEFAULT')
@@ -523,13 +523,13 @@ class BTool_FastTransform(Operator):
if event.type == 'LEFTMOUSE':
if isBrush(actObj):
EnableThisBrush(bpy.context, "True")
- actObj.draw_type = "WIRE"
+ actObj.display_type = "WIRE"
return {'FINISHED'}
if event.type in {'RIGHTMOUSE', 'ESC'}:
if isBrush(actObj):
EnableThisBrush(bpy.context, "True")
- actObj.draw_type = "WIRE"
+ actObj.display_type = "WIRE"
return {'CANCELLED'}
return {'RUNNING_MODAL'}
diff --git a/object_cloud_gen.py b/object_cloud_gen.py
index 008763fc5..6601b8f1e 100644
--- a/object_cloud_gen.py
+++ b/object_cloud_gen.py
@@ -563,7 +563,7 @@ class GenerateCloud(Operator):
# Select all of the left over boxes so people can immediately
# press generate again if they want
for eachMember in definitionObjects:
- eachMember.draw_type = 'SOLID'
+ eachMember.display_type = 'SOLID'
eachMember.select = True
eachMember.hide_render = False
@@ -576,7 +576,7 @@ class GenerateCloud(Operator):
# Create a new object cloudPnts
cloudPnts = addNewObject(scene, "CloudPoints", bounds)
cloudPnts["CloudMember"] = "CreatedObj"
- cloudPnts.draw_type = 'WIRE'
+ cloudPnts.display_type = 'WIRE'
cloudPnts.hide_render = True
makeParent(bounds, cloudPnts, scene)
@@ -606,7 +606,7 @@ class GenerateCloud(Operator):
selectedObjects[0]
)
- bounds.draw_type = 'BOUNDS'
+ bounds.display_type = 'BOUNDS'
bounds.hide_render = False
# Just add a Definition Property designating this
@@ -630,7 +630,7 @@ class GenerateCloud(Operator):
for selObj in selectedObjects:
selObj["CloudMember"] = "DefinitionObj"
selObj.name = "DefinitionObj"
- selObj.draw_type = 'WIRE'
+ selObj.display_type = 'WIRE'
selObj.hide_render = True
selObj.hide = True
makeParent(bounds, selObj, scene)
@@ -638,7 +638,7 @@ class GenerateCloud(Operator):
# Do the same to the 1. object since it is no longer in list.
firstObject["CloudMember"] = "DefinitionObj"
firstObject.name = "DefinitionObj"
- firstObject.draw_type = 'WIRE'
+ firstObject.display_type = 'WIRE'
firstObject.hide_render = True
makeParent(bounds, firstObject, scene)
@@ -646,7 +646,7 @@ class GenerateCloud(Operator):
# Create a new object cloud.
cloud = addNewObject(scene, "CloudMesh", bounds)
cloud["CloudMember"] = "CreatedObj"
- cloud.draw_type = 'WIRE'
+ cloud.display_type = 'WIRE'
cloud.hide_render = True
makeParent(bounds, cloud, scene)
@@ -677,7 +677,7 @@ class GenerateCloud(Operator):
cloudParticles.settings.frame_end = 0
cloudParticles.settings.emit_from = 'VOLUME'
cloudParticles.settings.lifetime = scene.frame_end
- cloudParticles.settings.draw_method = 'DOT'
+ cloudParticles.settings.display_method = 'DOT'
cloudParticles.settings.render_type = 'NONE'
cloudParticles.settings.distribution = 'RAND'
cloudParticles.settings.physics_type = 'NEWTON'
@@ -836,7 +836,7 @@ class GenerateCloud(Operator):
# Create a new object cloudPnts
cloudPnts = addNewObject(scene, "CloudPoints", bounds)
cloudPnts["CloudMember"] = "CreatedObj"
- cloudPnts.draw_type = 'WIRE'
+ cloudPnts.display_type = 'WIRE'
cloudPnts.hide_render = True
makeParent(bounds, cloudPnts, scene)
diff --git a/object_fracture_cell/__init__.py b/object_fracture_cell/__init__.py
index ad4cdf399..891027f21 100644
--- a/object_fracture_cell/__init__.py
+++ b/object_fracture_cell/__init__.py
@@ -75,8 +75,8 @@ def main_object(scene, obj, level, **kw):
obj.select = False
if kw_copy["use_debug_redraw"]:
- obj_draw_type_prev = obj.draw_type
- obj.draw_type = 'WIRE'
+ obj_display_type_prev = obj.display_type
+ obj.display_type = 'WIRE'
objects = fracture_cell_setup.cell_fracture_objects(scene, obj, **kw_copy)
objects = fracture_cell_setup.cell_fracture_boolean(scene, obj, objects,
@@ -172,7 +172,7 @@ def main_object(scene, obj, level, **kw):
group.objects.link(obj_cell)
if kw_copy["use_debug_redraw"]:
- obj.draw_type = obj_draw_type_prev
+ obj.display_type = obj_display_type_prev
# testing only!
# obj.hide = True
diff --git a/render_povray/render.py b/render_povray/render.py
index 920dc7ff3..8494bfd52 100644
--- a/render_povray/render.py
+++ b/render_povray/render.py
@@ -2111,7 +2111,7 @@ def write_pov(filename, scene=None, info_callback=None):
strandShape = 0.0
# Set the number of particles to render count rather than 3d view display
pSys.set_resolution(scene, ob, 'RENDER')
- steps = pSys.settings.draw_step
+ steps = pSys.settings.display_step
steps = 3 ** steps # or (power of 2 rather than 3) + 1 # Formerly : len(particle.hair_keys)
totalNumberOfHairs = ( len(pSys.particles) + len(pSys.child_particles) )
@@ -2163,7 +2163,7 @@ def write_pov(filename, scene=None, info_callback=None):
elif step == 0:
hDiameter = strandStart
else:
- hDiameter += (strandEnd-strandStart)/(pSys.settings.draw_step+1) #XXX +1 or not?
+ hDiameter += (strandEnd-strandStart)/(pSys.settings.display_step+1) #XXX +1 or not?
if step == 0 and pSys.settings.use_hair_bspline:
# Write three times the first point to compensate pov Bezier handling
file.write('<%.6g,%.6g,%.6g>,%.7g,\n' % (co[0], co[1], co[2], abs(hDiameter)))
@@ -4468,4 +4468,4 @@ class RunPovTextRender(Operator):
#empty text name property engain
scene.pov.text_block = ""
- return {'FINISHED'}
\ No newline at end of file
+ return {'FINISHED'}
diff --git a/rigify/generate.py b/rigify/generate.py
index 4888aedd0..0631cce36 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -96,12 +96,12 @@ def generate_rig(context, metarig):
rig_old_name = name
name = rig_new_name or name
obj = bpy.data.objects.new(name, bpy.data.armatures.new(name))
- obj.draw_type = 'WIRE'
+ obj.display_type = 'WIRE'
scene.objects.link(obj)
else:
name = rig_new_name or "rig"
obj = bpy.data.objects.new(name, bpy.data.armatures.new(name)) # in case name 'rig' exists it will be rig.001
- obj.draw_type = 'WIRE'
+ obj.display_type = 'WIRE'
scene.objects.link(obj)
id_store.rigify_target_rig = obj.name
diff --git a/rigify/legacy/generate.py b/rigify/legacy/generate.py
index 3bc9823b9..f1d9c8b07 100644
--- a/rigify/legacy/generate.py
+++ b/rigify/legacy/generate.py
@@ -88,7 +88,7 @@ def generate_rig(context, metarig):
obj = scene.objects[name]
except KeyError:
obj = bpy.data.objects.new(name, bpy.data.armatures.new(name))
- obj.draw_type = 'WIRE'
+ obj.display_type = 'WIRE'
scene.objects.link(obj)
obj.data.pose_position = 'POSE'
diff --git a/space_view3d_copy_attributes.py b/space_view3d_copy_attributes.py
index fecbcf645..f6e79e3ac 100644
--- a/space_view3d_copy_attributes.py
+++ b/space_view3d_copy_attributes.py
@@ -356,17 +356,17 @@ def obVisSca(ob, active, context):
def obDrw(ob, active, context):
- ob.draw_type = active.draw_type
+ ob.display_type = active.display_type
ob.show_axis = active.show_axis
ob.show_bounds = active.show_bounds
- ob.draw_bounds_type = active.draw_bounds_type
+ ob.display_bounds_type = active.display_bounds_type
ob.show_name = active.show_name
ob.show_texture_space = active.show_texture_space
ob.show_transparent = active.show_transparent
ob.show_wire = active.show_wire
- ob.show_x_ray = active.show_x_ray
- ob.empty_draw_type = active.empty_draw_type
- ob.empty_draw_size = active.empty_draw_size
+ ob.show_in_front = active.show_in_front
+ ob.empty_display_type = active.empty_display_type
+ ob.empty_display_size = active.empty_display_size
def obOfs(ob, active, context):
diff --git a/space_view3d_display_tools/__init__.py b/space_view3d_display_tools/__init__.py
index 58699f981..9aa53a31a 100644
--- a/space_view3d_display_tools/__init__.py
+++ b/space_view3d_display_tools/__init__.py
@@ -80,7 +80,7 @@ class DisplayToolsPanel(Panel):
bl_category = "Display"
bl_options = {'DEFAULT_CLOSED'}
- draw_type_icons = {
+ display_type_icons = {
'BOUNDS': 'BBOX',
'WIRE': 'WIRE',
'SOLID': 'SOLID',
@@ -142,7 +142,7 @@ class DisplayToolsPanel(Panel):
col.prop(view, "show_all_objects_origin", toggle=True)
col.prop(view, "show_backface_culling", toggle=True)
if obj:
- col.prop(obj, "show_x_ray", text="X-Ray", toggle=True)
+ col.prop(obj, "show_in_front", text="X-Ray", toggle=True)
if obj and obj_type == 'MESH':
col.prop(obj, "show_transparent", text="Transparency", toggle=True)
@@ -176,8 +176,8 @@ class DisplayToolsPanel(Panel):
if obj:
col = layout.column(align=True)
col.alignment = 'EXPAND'
- col.label(text="Maximum:")
- col.prop(obj, "draw_type", text="", icon=self.draw_type_icons[obj.draw_type])
+ col.label(text="Display As:")
+ col.prop(obj, "display_type", text="", icon=self.display_type_icons[obj.display_type])
col = layout.column(align=True)
col.alignment = 'CENTER'
diff --git a/space_view3d_display_tools/display.py b/space_view3d_display_tools/display.py
index d0310ee87..6c1c67965 100644
--- a/space_view3d_display_tools/display.py
+++ b/space_view3d_display_tools/display.py
@@ -82,10 +82,10 @@ class DisplayDrawChange(Operator, BasePollCheck):
if not selection:
for obj in bpy.data.objects:
- obj.draw_type = self.drawing
+ obj.display_type = self.drawing
else:
for obj in selection:
- obj.draw_type = self.drawing
+ obj.display_type = self.drawing
except:
self.report({'ERROR'}, "Setting Draw Type could not be applied")
return {'CANCELLED'}
@@ -110,12 +110,12 @@ class DisplayBoundsSwitch(Operator, BasePollCheck):
for obj in bpy.data.objects:
obj.show_bounds = self.bounds
if self.bounds:
- obj.draw_bounds_type = scene.BoundingMode
+ obj.display_bounds_type = scene.BoundingMode
else:
for obj in selection:
obj.show_bounds = self.bounds
if self.bounds:
- obj.draw_bounds_type = scene.BoundingMode
+ obj.display_bounds_type = scene.BoundingMode
except:
self.report({'ERROR'}, "Display/Hide Bounding box overlay failed")
return {'CANCELLED'}
@@ -164,10 +164,10 @@ class DisplayXRayOn(Operator, BasePollCheck):
if not selection:
for obj in bpy.data.objects:
- obj.show_x_ray = self.xrays
+ obj.show_in_front = self.xrays
else:
for obj in selection:
- obj.show_x_ray = self.xrays
+ obj.show_in_front = self.xrays
except:
self.report({'ERROR'}, "Turn on/off X-ray mode failed")
return {'CANCELLED'}
diff --git a/space_view3d_display_tools/fast_navigate.py b/space_view3d_display_tools/fast_navigate.py
index 269aec2c6..5d61138a0 100644
--- a/space_view3d_display_tools/fast_navigate.py
+++ b/space_view3d_display_tools/fast_navigate.py
@@ -43,14 +43,14 @@ def display_particles(mode, dis_particles):
for particles in bpy.data.particles:
if scene.ShowParticles is False:
- particles.draw_method = 'NONE'
+ particles.display_method = 'NONE'
else:
if particles.type == 'EMITTER':
- particles.draw_method = 'DOT'
- particles.draw_percentage = 100
+ particles.display_method = 'DOT'
+ particles.display_percentage = 100
else:
- particles.draw_method = 'RENDER'
- particles.draw_percentage = dis_particles
+ particles.display_method = 'RENDER'
+ particles.display_percentage = dis_particles
return dis_particles
@@ -149,15 +149,15 @@ class FastNavigate(Operator):
self.store_viewport_shade = shade
for particle in bpy.data.particles:
self.store_init_particles[particle.name] = \
- [particle.draw_method, particle.draw_percentage]
+ [particle.display_method, particle.display_percentage]
else:
if not shade:
self.store_fail = True
else:
shade = self.store_viewport_shade or 'SOLID'
for particle in bpy.data.particles:
- particle.draw_method = self.store_init_particles[particle.name][0]
- particle.draw_percentage = self.store_init_particles[particle.name][1]
+ particle.display_method = self.store_init_particles[particle.name][0]
+ particle.display_percentage = self.store_init_particles[particle.name][1]
except:
self.store_fail = True
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index eaa7f0fdf..a470571ed 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -602,7 +602,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
layout.menu("VIEW3D_MT_CursorMenuLite", icon='CURSOR')
layout.menu("VIEW3D_MT_PoseCopy", icon='FILE')
- if arm.draw_type in {'BBONE', 'ENVELOPE'}:
+ if arm.display_type in {'BBONE', 'ENVELOPE'}:
layout.operator("transform.transform",
text="Scale Envelope Distance").mode = 'BONE_SIZE'
@@ -1895,7 +1895,7 @@ class VIEW3D_MT_TransformMenu(Menu):
layout = self.layout
layout.menu("VIEW3D_MT_ManipulatorMenu1")
UseSeparator(self, context)
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
UseSeparator(self, context)
@@ -1925,7 +1925,7 @@ class VIEW3D_MT_TransformMenuEdit(Menu):
layout = self.layout
layout.menu("VIEW3D_MT_ManipulatorMenu1")
UseSeparator(self, context)
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
UseSeparator(self, context)
@@ -1955,7 +1955,7 @@ class VIEW3D_MT_TransformMenuLite(Menu):
layout = self.layout
layout.menu("VIEW3D_MT_ManipulatorMenu1")
UseSeparator(self, context)
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
UseSeparator(self, context)
@@ -1976,7 +1976,7 @@ class VIEW3D_MT_TransformMenuCamera(Menu):
layout.menu("VIEW3D_MT_ManipulatorMenu1")
layout.menu("VIEW3D_MT_object_clear")
layout.menu("VIEW3D_MT_object_apply")
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
layout.operator("object.align")
@@ -1995,7 +1995,7 @@ class VIEW3D_MT_TransformMenuArmature(Menu):
layout.menu("VIEW3D_MT_ManipulatorMenu1")
UseSeparator(self, context)
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
UseSeparator(self, context)
@@ -2021,7 +2021,7 @@ class VIEW3D_MT_TransformMenuArmatureEdit(Menu):
layout = self.layout
layout.menu("VIEW3D_MT_ManipulatorMenu1")
UseSeparator(self, context)
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
UseSeparator(self, context)
@@ -2043,7 +2043,7 @@ class VIEW3D_MT_TransformMenuArmaturePose(Menu):
def draw(self, context):
layout = self.layout
layout.menu("VIEW3D_MT_ManipulatorMenu1")
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
UseSeparator(self, context)
@@ -2057,9 +2057,9 @@ class VIEW3D_MT_TransformMenuArmaturePose(Menu):
layout.operator("pose.user_transforms_clear", text="Reset unkeyed")
obj = context.object
if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}:
- if obj.data.draw_type == 'BBONE':
+ if obj.data.display_type == 'BBONE':
layout.operator("transform.transform", text="Scale BBone").mode = 'BONE_SIZE'
- elif obj.data.draw_type == 'ENVELOPE':
+ elif obj.data.display_type == 'ENVELOPE':
layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONE_SIZE'
layout.operator("transform.transform", text="Scale Radius").mode = 'BONE_ENVELOPE'
@@ -2229,7 +2229,7 @@ class VIEW3D_MT_Shade(Menu):
UseSeparator(self, context)
layout.operator("view3d.display_wire_all", text="Wire all", icon='WIRE')
- layout.prop(context.object, "show_x_ray", text="X-Ray", icon="META_CUBE")
+ layout.prop(context.object, "show_in_front", text="X-Ray", icon="META_CUBE")
UseSeparator(self, context)
layout.prop(context.space_data.fx_settings, "use_ssao",
diff --git a/ui_layer_manager.py b/ui_layer_manager.py
index 018aad265..662dd3e52 100644
--- a/ui_layer_manager.py
+++ b/ui_layer_manager.py
@@ -277,11 +277,11 @@ class SCENE_OT_namedlayer_toggle_wire(Operator):
group_layers = scene.layergroups[group_idx].layers
layers = obj.layers
if True in {layer and group_layer for layer, group_layer in zip(layers, group_layers)}:
- obj.draw_type = display
+ obj.display_type = display
scene.layergroups[group_idx].use_wire = use_wire
else:
if obj.layers[layer_idx]:
- obj.draw_type = display
+ obj.display_type = display
scene.namedlayers.layers[layer_idx].use_wire = use_wire
return {'FINISHED'}
--
GitLab