[Bf-extensions-cvs] [9ff1e5ec] blender2.8: 2.8: update for x_ray and draw/display renaming.

Brecht Van Lommel noreply at git.blender.org
Thu Sep 6 13:26:23 CEST 2018


Commit: 9ff1e5eca76413b0f178ead688e9cde1c1385e36
Author: Brecht Van Lommel
Date:   Mon Sep 3 19:02:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBA9ff1e5eca76413b0f178ead688e9cde1c1385e36

2.8: update for x_ray and draw/display renaming.

===================================================================

M	add_advanced_objects_menu/mesh_easylattice.py
M	add_advanced_objects_menu/rope_alpha.py
M	add_advanced_objects_menu/scene_objects_bi.py
M	add_advanced_objects_menu/scene_objects_cycles.py
M	add_advanced_objects_menu/scene_texture_render.py
M	add_advanced_objects_panels/object_laplace_lightning.py
M	add_advanced_objects_panels/unfold_transition.py
M	add_curve_extra_objects/add_curve_spirofit_bouncespline.py
M	add_curve_sapling/utils.py
M	add_mesh_extra_objects/add_empty_as_parent.py
M	archimesh/achm_door_maker.py
M	archimesh/achm_window_maker.py
M	archimesh/achm_window_panel.py
M	archipack/archipack_autoboolean.py
M	archipack/archipack_gl.py
M	archipack/archipack_wall2.py
M	camera_dolly_crane_rigs.py
M	camera_turnaround.py
M	io_anim_acclaim/__init__.py
M	io_anim_bvh/import_bvh.py
M	io_anim_c3d/__init__.py
M	io_anim_camera.py
M	io_import_dxf/dxfimport/do.py
M	io_scene_fbx/export_fbx_bin.py
M	io_scene_ms3d/ms3d_import.py
M	io_scene_x3d/import_x3d.py
M	light_field_tools/light_field_tools.py
M	measureit/measureit_main.py
M	mesh_carver.py
M	modules/rna_manual_reference.py
M	object_boolean_tools.py
M	object_cloud_gen.py
M	object_fracture_cell/__init__.py
M	render_povray/render.py
M	rigify/generate.py
M	rigify/legacy/generate.py
M	space_view3d_copy_attributes.py
M	space_view3d_display_tools/__init__.py
M	space_view3d_display_tools/display.py
M	space_view3d_display_tools/fast_navigate.py
M	space_view3d_spacebar_menu.py
M	ui_layer_manager.py

===================================================================

diff --git a/add_advanced_objects_menu/mesh_easylattice.py b/add_advanced_objects_menu/mesh_easylattice.py
index 9a43474c..78f3d020 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 904168a1..4ef23fc1 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 f8afd906..94bda4bc 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 b6831791..7158b02f 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 02d6490b..0f9ccc2b 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 f33ed935..f653de53 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 42d8c3ba..44051bf0 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 d0c1c747..5219bc31 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 af23e434..00949a81 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 bcaecf64..32d0d167 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 6d048bfd..4ef99373 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 5095f47e..dd12b4b4 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 592e13a6..859f8f9a 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 93e9bc98..43a677b4 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 c50c61a2..e8182fed 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 92172eb1..551e87f6 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

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list