[Bf-extensions-cvs] [714be6e7] master: Update addon to Blender 2.8

Spivak Vladimir cwolf3d noreply at git.blender.org
Sun Apr 21 02:10:57 CEST 2019


Commit: 714be6e7385df9bea3a3abdf417d3cf9bbc2e6d7
Author: Spivak Vladimir (cwolf3d)
Date:   Sun Apr 21 03:08:04 2019 +0300
Branches: master
https://developer.blender.org/rBAC714be6e7385df9bea3a3abdf417d3cf9bbc2e6d7

Update addon to Blender 2.8

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

M	add_dimension.py

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

diff --git a/add_dimension.py b/add_dimension.py
index 12994808..bd8f78fb 100644
--- a/add_dimension.py
+++ b/add_dimension.py
@@ -19,8 +19,8 @@
 bl_info = {
     'name': 'Dimension',
     'author': 'Spivak Vladimir (http://cwolf3d.korostyshev.net)',
-    'version': (3, 9, 5),
-    'blender': (2, 78, 0),
+    'version': (4, 0, 0),
+    'blender': (2, 80, 0),
     'location': 'View3D > Add > Curve',
     'description': 'Adds Dimension',
     'warning': '', # used for warning icon and text in addons panel
@@ -43,6 +43,7 @@ def addText(string = '', loc = ((0, 0, 0)), textsize = 1, align = 'CENTER', offs
     tcu = bpy.data.curves.new(string + 'Data', 'FONT')
     text = bpy.data.objects.new(string + 'Text', tcu)
     tcu.body = string
+    tcu.fill_mode = 'NONE'
     tcu.align_x = align
     tcu.size = textsize
     tcu.offset_y = offset_y
@@ -1421,15 +1422,16 @@ def makeMaterial(name, diffuse, specular, alpha):
 
     mat = bpy.data.materials.new(name)
     mat.diffuse_color = diffuse
-    mat.diffuse_shader = 'LAMBERT'
-    mat.diffuse_intensity = 1.0
+    #mat.diffuse_shader = 'LAMBERT'
+    #mat.diffuse_intensity = 1.0
     mat.specular_color = specular
-    mat.specular_shader = 'COOKTORR'
-    mat.specular_intensity = 1.0
-    mat.alpha = alpha
-    mat.ambient = 1
-    mat.specular_hardness = 1
-    mat.use_shadeless = True
+    #mat.specular_shader = 'COOKTORR'
+    mat.specular_intensity = 0.0
+    mat.roughness = 0.0
+    #mat.alpha = alpha
+    #mat.ambient = 1
+    #mat.specular_hardness = 1
+    #mat.use_shadeless = True
 
     return mat
 
@@ -1453,7 +1455,7 @@ def align_matrix(context, location):
         rot = context.space_data.region_3d.view_matrix.to_3x3().inverted().to_4x4()
     else:
         rot = Matrix()
-    align_matrix = loc * rot
+    align_matrix = loc @ rot
 
     return align_matrix
 
@@ -1522,13 +1524,14 @@ def createCurve(vertArray, self, align_matrix):
 
     # set curveOptions
     newCurve.dimensions = '2D'
+    newCurve.fill_mode = 'NONE'    
     newSpline.use_cyclic_u = True
     newSpline.use_endpoint_u = True
 
     # create object with newCurve
     DimensionCurve = bpy.data.objects.new(name, newCurve) # object
     bpy.context.collection.objects.link(DimensionCurve) # place in active scene
-    DimensionCurve.Dimension = True
+    DimensionCurve["Dimension"] = True
     DimensionCurve.matrix_world = align_matrix # apply matrix
     self.Dimension_Name = DimensionCurve.name
 
@@ -1736,7 +1739,7 @@ def createCurve(vertArray, self, align_matrix):
         setMaterial(DimensionCurve, bpy.data.materials[self.Dimension_matname])
         setMaterial(DimensionText, bpy.data.materials[self.Dimension_matname])
     else:
-        red = makeMaterial(self.Dimension_matname, (1, 0, 0), (1, 0, 0), 1)
+        red = makeMaterial(self.Dimension_matname, (1, 0, 0, 0), (1, 0, 0), 1)
         setMaterial(DimensionCurve, red)
         setMaterial(DimensionText, red)
 
@@ -1772,55 +1775,55 @@ def createCurve(vertArray, self, align_matrix):
     bpy.context.view_layer.objects.active = DimensionCurve
     bpy.context.scene.update()
 
-    DimensionCurve.Dimension_Name = self.Dimension_Name
-    DimensionCurve.Dimension_Type = self.Dimension_Type
-    DimensionCurve.Dimension_XYZType = self.Dimension_XYZType
-    DimensionCurve.Dimension_XYType = self.Dimension_XYType
-    DimensionCurve.Dimension_XZType = self.Dimension_XZType
-    DimensionCurve.Dimension_YZType = self.Dimension_YZType
-    DimensionCurve.Dimension_startlocation = c
-    DimensionCurve.Dimension_endlocation = self.Dimension_endlocation
-    DimensionCurve.Dimension_endanglelocation = self.Dimension_endanglelocation
-    DimensionCurve.Dimension_width_or_location = self.Dimension_width_or_location
-    DimensionCurve.Dimension_liberty = self.Dimension_liberty
-    DimensionCurve.Dimension_Change = False
+    DimensionCurve["Dimension_Name"] = self.Dimension_Name
+    DimensionCurve["Dimension_Type"] = self.Dimension_Type
+    DimensionCurve["Dimension_XYZType"] = self.Dimension_XYZType
+    DimensionCurve["Dimension_XYType"] = self.Dimension_XYType
+    DimensionCurve["Dimension_XZType"] = self.Dimension_XZType
+    DimensionCurve["Dimension_YZType"] = self.Dimension_YZType
+    DimensionCurve["Dimension_startlocation"] = c
+    DimensionCurve["Dimension_endlocation"] = self.Dimension_endlocation
+    DimensionCurve["Dimension_endanglelocation"] = self.Dimension_endanglelocation
+    DimensionCurve["Dimension_width_or_location"] = self.Dimension_width_or_location
+    DimensionCurve["Dimension_liberty"] = self.Dimension_liberty
+    DimensionCurve["Dimension_Change"] = False
 
     #### Dimension properties
-    DimensionCurve.Dimension_resolution = self.Dimension_resolution
-    DimensionCurve.Dimension_width = self.Dimension_width
-    DimensionCurve.Dimension_length = self.Dimension_length
-    DimensionCurve.Dimension_dsize = self.Dimension_dsize
-    DimensionCurve.Dimension_depth = self.Dimension_depth
-    DimensionCurve.Dimension_depth_from_center = self.Dimension_depth_from_center
-    DimensionCurve.Dimension_angle = self.Dimension_angle
-    DimensionCurve.Dimension_rotation = self.Dimension_rotation
-    DimensionCurve.Dimension_offset = self.Dimension_offset
+    DimensionCurve["Dimension_resolution"] = self.Dimension_resolution
+    DimensionCurve["Dimension_width"] = self.Dimension_width
+    DimensionCurve["Dimension_length"] = self.Dimension_length
+    DimensionCurve["Dimension_dsize"] = self.Dimension_dsize
+    DimensionCurve["Dimension_depth"] = self.Dimension_depth
+    DimensionCurve["Dimension_depth_from_center"] = self.Dimension_depth_from_center
+    DimensionCurve["Dimension_angle"] = self.Dimension_angle
+    DimensionCurve["Dimension_rotation"] = self.Dimension_rotation
+    DimensionCurve["Dimension_offset"] = self.Dimension_offset
 
     #### Dimension text properties
-    DimensionCurve.Dimension_textsize = self.Dimension_textsize
-    DimensionCurve.Dimension_textdepth = self.Dimension_textdepth
-    DimensionCurve.Dimension_textround = self.Dimension_textround
-    DimensionCurve.Dimension_font = self.Dimension_font
+    DimensionCurve["Dimension_textsize"] = self.Dimension_textsize
+    DimensionCurve["Dimension_textdepth"] = self.Dimension_textdepth
+    DimensionCurve["Dimension_textround"] = self.Dimension_textround
+    DimensionCurve["Dimension_font"] = self.Dimension_font
 
     #### Dimension Arrow properties
-    DimensionCurve.Dimension_arrow = self.Dimension_arrow
-    DimensionCurve.Dimension_arrowdepth = self.Dimension_arrowdepth
-    DimensionCurve.Dimension_arrowlength = self.Dimension_arrowlength
+    DimensionCurve["Dimension_arrow"] = self.Dimension_arrow
+    DimensionCurve["Dimension_arrowdepth"] = self.Dimension_arrowdepth
+    DimensionCurve["Dimension_arrowlength"] = self.Dimension_arrowlength
 
     #### Materials properties
-    DimensionCurve.Dimension_matname = self.Dimension_matname
+    DimensionCurve["Dimension_matname"] = self.Dimension_matname
 
     #### Note properties
-    DimensionCurve.Dimension_note = self.Dimension_note
-    DimensionCurve.Dimension_align_to_camera = self.Dimension_align_to_camera
+    DimensionCurve["Dimension_note"] = self.Dimension_note
+    DimensionCurve["Dimension_align_to_camera"] = self.Dimension_align_to_camera
 
     #### Parent
-    DimensionCurve.Dimension_parent = self.Dimension_parent
-    DimensionCurve.Dimension_appoint_parent = self.Dimension_appoint_parent
+    DimensionCurve["Dimension_parent"] = self.Dimension_parent
+    DimensionCurve["Dimension_appoint_parent"] = self.Dimension_appoint_parent
 
     #### Units
-    DimensionCurve.Dimension_units = self.Dimension_units
-    DimensionCurve.Dimension_add_units_name = self.Dimension_add_units_name
+    DimensionCurve["Dimension_units"] = self.Dimension_units
+    DimensionCurve["Dimension_add_units_name"] = self.Dimension_add_units_name
 
     return
 
@@ -2073,25 +2076,27 @@ class Dimension(bpy.types.Operator):
     ''''''
     bl_idname = "curve.dimension"
     bl_label = "Dimension"
-    bl_options = {'REGISTER', 'UNDO'}
+    bl_options = {'REGISTER', 'UNDO', 'PRESET'}
     bl_description = "add dimension"
+    
+    #settings : bpy.props.PointerProperty(type=DimensionVariables)
 
     # align_matrix for the invoke
-    align_matrix = Matrix()
+    align_matrix : Matrix()
 
-    Dimension = BoolProperty(name = "Dimension",
+    Dimension : BoolProperty(name = "Dimension",
                 default = True,
                 description = "dimension")
 
     #### change properties
-    Dimension_Name = StringProperty(name = "Name",
+    Dimension_Name : StringProperty(name = "Name",
                     description = "Name")
 
-    Dimension_Change = BoolProperty(name = "Change",
+    Dimension_Change : BoolProperty(name = "Change",
                 default = False,
                 description = "change dimension")
 
-    Dimension_Delete = StringProperty(name = "Delete",
+    Dimension_Delete : StringProperty(name = "Delete",
                     description = "Delete dimension")
 
     #### general properties
@@ -2104,7 +2109,7 @@ class Dimension(bpy.types.Operator):
              ('Angular2', 'Angular2', 'Angular2'),
              ('Angular3', 'Angular3', 'Angular3'),
              ('Note', 'Note', 'Note')]
-    Dimension_Type = EnumProperty(name = "Type",
+    Dimension_Type : EnumProperty(name = "Type",
                 description = "Form of Curve to create",
                 items = Types)
     XYZTypes = [
@@ -2114,49 +2119,49 @@ class Dimension(bpy.types.Operator):
                 ('BOTTOM', 'Bottom', 'BOTTOM'),
                 ('BACK', 'Back', 'BACK'),
                 ('LEFT', 'Left', 'LEFT')]
-    Dimension_XYZType = EnumProperty(name = "Coordinate system",
+    Dimension_XYZType : EnumProperty(name = "Coordinate system",
                 description = "Place in a coordinate system",
                 items = XYZTypes)
     XYTypes = [
                 ('X', 'X', 'X'),
                 ('Y', 'Y', 'Y')]
-    Dimension_XYType = EnumProperty(name = "XY",
+    Dimension_XYType : EnumProperty(name = "XY",
                 description = "XY",
                 items = XYTypes)
     XZTypes = [
  

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list