[Bf-extensions-cvs] [a91c856f] 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:29 CEST 2018


Commit: a91c856f0ced4db76445fa6c0560ad598c71c276
Author: Brecht Van Lommel
Date:   Mon Sep 3 19:03:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBACa91c856f0ced4db76445fa6c0560ad598c71c276

2.8: update for x_ray and draw/display renaming.

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

M	io_import_voodoo_camera.py
M	io_scene_cod/import_xmodel.py
M	io_scene_fpx/fpx_import.py
M	mesh_ktools.py
M	mesh_xoffsets.py
M	np_station/utils_graphics.py
M	object_particle_hair_lab.py
M	space_view3d_enhanced_3d_cursor.py
M	space_view3d_toolshelf_menu.py

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

diff --git a/io_import_voodoo_camera.py b/io_import_voodoo_camera.py
index f3fac30c..8072db8a 100644
--- a/io_import_voodoo_camera.py
+++ b/io_import_voodoo_camera.py
@@ -81,7 +81,7 @@ def voodoo_import(infile,ld_cam,ld_points):
         data.dof_distance = 0.0
         data.clip_start = 0.1
         data.clip_end = 1000.0
-        data.draw_size = 0.5
+        data.display_size = 0.5
         scene.objects.link(vcam)
         vcam.parent = dummy
 
diff --git a/io_scene_cod/import_xmodel.py b/io_scene_cod/import_xmodel.py
index 6f862e0b..a643d1b3 100644
--- a/io_scene_cod/import_xmodel.py
+++ b/io_scene_cod/import_xmodel.py
@@ -299,7 +299,7 @@ def load(self, context, filepath=""):
         enter_editmode=True,
         location=origin)
     ob = bpy.context.object
-    ob.show_x_ray = True
+    ob.show_in_front = True
     ob.name = name
     amt = ob.data
     amt.name = name + "Amt"
@@ -351,7 +351,7 @@ def createRig(context, name, origin, boneTable):
         enter_editmode=True,
         location=origin)
     ob = bpy.context.object
-    ob.show_x_ray = True
+    ob.show_in_front = True
     ob.name = name
     amt = ob.data
     amt.name = name + "Amt"
diff --git a/io_scene_fpx/fpx_import.py b/io_scene_fpx/fpx_import.py
index f9351db8..42cea236 100644
--- a/io_scene_fpx/fpx_import.py
+++ b/io_scene_fpx/fpx_import.py
@@ -827,8 +827,8 @@ class FptImporter():
                             blender_empty_object.location = blender_position
                             blender_empty_object.rotation_mode = 'XZY'
                             blender_empty_object.rotation_euler = blender_rotation
-                            blender_empty_object.empty_draw_type = 'ARROWS'
-                            blender_empty_object.empty_draw_size = 10.0
+                            blender_empty_object.empty_display_type = 'ARROWS'
+                            blender_empty_object.empty_display_size = 10.0
                             self.__scene.objects.link(blender_empty_object)
                             blender_empty_object.layers = layers
 
@@ -985,7 +985,7 @@ class FptImporter():
         camera.clip_start = 1.0 # 1.0mm
         camera.clip_end = 10000.0 # 10.0m
         camera.dof_distance = 1211.0
-        camera.draw_size = 100.0
+        camera.display_size = 100.0
         self.__scene.camera = obj
         for area in self.__context.screen.areas:
             if area.type == 'VIEW_3D':
@@ -2018,8 +2018,8 @@ class FptImporter():
             blender_empty_object.rotation_mode = 'XZY'
             v = (cu.splines[-1].bezier_points[0].handle_left - cu.splines[-1].bezier_points[0].co)
             blender_empty_object.rotation_euler = Euler((0, 0, Vector((v.x, v.y)).angle_signed(Vector((1.0, 0.0)))), 'XZY')
-            blender_empty_object.empty_draw_type = 'ARROWS'
-            blender_empty_object.empty_draw_size = 10.0
+            blender_empty_object.empty_display_type = 'ARROWS'
+            blender_empty_object.empty_display_size = 10.0
             self.__scene.objects.link(blender_empty_object)
             blender_empty_object.fpt.name = FORMAT_EMPTY_OBJECT.format(FORMAT_MODEL_START.format(name))
             if fpx_id:
@@ -2035,8 +2035,8 @@ class FptImporter():
             blender_empty_object.rotation_mode = 'XZY'
             v = (cu.splines[-1].bezier_points[-1].handle_right - cu.splines[-1].bezier_points[-1].co)
             blender_empty_object.rotation_euler = Euler((0, 0, Vector((v.x, v.y)).angle_signed(Vector((1.0, 0.0)))), 'XZY')
-            blender_empty_object.empty_draw_type = 'ARROWS'
-            blender_empty_object.empty_draw_size = 10.0
+            blender_empty_object.empty_display_type = 'ARROWS'
+            blender_empty_object.empty_display_size = 10.0
             self.__scene.objects.link(blender_empty_object)
             blender_empty_object.fpt.name = FORMAT_EMPTY_OBJECT.format(FORMAT_MODEL_END.format(name))
             if fpx_id:
@@ -2133,8 +2133,8 @@ class FptImporter():
             blender_empty_object.rotation_mode = 'XZY'
             v = (bezier_point.handle_right - bezier_point.co)
             blender_empty_object.rotation_euler = Euler((0, 0, Vector((v.x, v.y)).angle_signed(Vector((1.0, 0.0)))), 'XZY')
-            blender_empty_object.empty_draw_type = 'ARROWS'
-            blender_empty_object.empty_draw_size = 10.0
+            blender_empty_object.empty_display_type = 'ARROWS'
+            blender_empty_object.empty_display_size = 10.0
             self.__scene.objects.link(blender_empty_object)
             blender_empty_object.fpt.name = FORMAT_MODEL_RING.format(name, index)
             if fpx_id:
@@ -2629,8 +2629,8 @@ class FptImporter():
             blender_empty_object_new.location = old_object.parent.location + old_object.location + offset
             blender_empty_object_new.rotation_mode = blender_empty_object.rotation_mode
             blender_empty_object_new.rotation_euler = Euler((0, 0, radians(angle)), blender_empty_object.rotation_mode)
-            blender_empty_object_new.empty_draw_type = blender_empty_object.empty_draw_type
-            blender_empty_object_new.empty_draw_size = blender_empty_object.empty_draw_size
+            blender_empty_object_new.empty_display_type = blender_empty_object.empty_display_type
+            blender_empty_object_new.empty_display_size = blender_empty_object.empty_display_size
             self.__scene.objects.link(blender_empty_object_new)
 
             old_group_dict = {}
diff --git a/mesh_ktools.py b/mesh_ktools.py
index 73b61f3b..418df810 100644
--- a/mesh_ktools.py
+++ b/mesh_ktools.py
@@ -564,7 +564,7 @@ class quickbool(bpy.types.Operator):
                                         bpy.ops.object.select_pattern(pattern=name)
                                         bpy.context.scene.objects.active = bpy.data.objects[name] 
 
-                                        bpy.context.object.draw_type = 'WIRE'
+                                        bpy.context.object.display_type = 'WIRE'
                                         
                                         # Move to garbage layer
                                         if move_to == True:
diff --git a/mesh_xoffsets.py b/mesh_xoffsets.py
index 4da6cf19..48975583 100644
--- a/mesh_xoffsets.py
+++ b/mesh_xoffsets.py
@@ -1278,12 +1278,10 @@ def exit_addon(self):
 def check_for_reg_overlap(self):
     system = bpy.context.user_preferences.system
     if system.use_region_overlap:
-        # other draw_method options don't create transparent side bars
-        if system.window_draw_method in ('TRIPLE_BUFFER', 'AUTOMATIC'):
-            area = bpy.context.area
-            for r in area.regions:
-                if r.type == 'TOOLS':
-                    self.rtoolsw = r.width
+        area = bpy.context.area
+        for r in area.regions:
+            if r.type == 'TOOLS':
+                self.rtoolsw = r.width
 
 
 def draw_callback_px(self, context):
diff --git a/np_station/utils_graphics.py b/np_station/utils_graphics.py
index e71160a4..884318ea 100644
--- a/np_station/utils_graphics.py
+++ b/np_station/utils_graphics.py
@@ -151,19 +151,17 @@ def display_instructions(region, rv3d, instruct, keys_aff, keys_nav, keys_neg):
     rwtools = 0
     rwui = 0
 
-    np_print(system.window_draw_method, system.use_region_overlap)
+    np_print(system.use_region_overlap)
 
 
     if system.use_region_overlap:
-        if system.window_draw_method in ('TRIPLE_BUFFER', 'AUTOMATIC') :
-
-            area = bpy.context.area
-            np_print('GO', area.regions)
-            for r in area.regions:
-                if r.type == 'TOOLS':
-                    rwtools = r.width
-                elif r.type == 'UI':
-                    rwui = r.width
+        area = bpy.context.area
+        np_print('GO', area.regions)
+        for r in area.regions:
+            if r.type == 'TOOLS':
+                rwtools = r.width
+            elif r.type == 'UI':
+                rwui = r.width
 
     np_print('rwtools', rwtools, 'rwui', rwui)
     field_keys_y = 46
diff --git a/object_particle_hair_lab.py b/object_particle_hair_lab.py
index e628e862..08b0815f 100644
--- a/object_particle_hair_lab.py
+++ b/object_particle_hair_lab.py
@@ -155,7 +155,7 @@ class testScene2(bpy.types.Operator):
         bpy.ops.object.camera_add(location = (0,-1,0),rotation = (1.571,0,0))
         cam = bpy.context.active_object.data
         cam.lens = 50
-        cam.draw_size = 0.1
+        cam.display_size = 0.1
 
 # add spot lamp
         bpy.ops.object.lamp_add(type="SPOT", location = (-0.7,-0.5,0.3), rotation =(1.223,0,-0.960))
@@ -296,7 +296,7 @@ class Generategrass(bpy.types.Operator):
             grassParticles.settings.use_hair_bspline = True
             grassParticles.settings.render_step = 5
             grassParticles.settings.length_random = 0.5
-            grassParticles.settings.draw_step = 5
+            grassParticles.settings.display_step = 5
 # children
             grassParticles.settings.rendered_child_count = 50
             grassParticles.settings.child_type = "INTERPOLATED"
@@ -408,7 +408,7 @@ class Generategrass(bpy.types.Operator):
             grassParticles.settings.use_hair_bspline = True
             grassParticles.settings.render_step = 7
             grassParticles.settings.length_random = 1.0
-            grassParticles.settings.draw_step = 2
+            grassParticles.settings.display_step = 2
 # children
             grassParticles.settings.child_type = "INTERPOLATED"
             grassParticles.settings.child_length = 0.160
@@ -501,7 +501,7 @@ class Generategrass(bpy.types.Operator):
             grassParticles.settings.use_hair_bspline = True
             grassParticles.settings.render_step = 3
             grassParticles.settings.length_random = 0.3
-            grassParticles.settings.draw_step = 3
+            grassParticles.settings.display_step = 3
 # children
             grassParticles.settings.child_type = "INTERPOLATED"
             grassParticles.settings.child_length = 0.667
@@ -616,7 +616,7 @@ class testScene4(bpy.types.Operator):
         bpy.ops.object.camera_add(location = (0,-1,0),rotation = (1.571,0,0))
         cam = bpy.context.active_object.data
         cam.len

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list