Merge branch 'dev'

README.md

@@ -29,7 +29,7 @@ and `Building Tools` was born.
 
 ## Installation
 
-1. Download add-on (zipped) from this [link](https://github.com/ranjian0/building_tools/releases/download/v1.0.9/building_tools-v1.0.9.zip).
+1. Download add-on (zipped) from this [link](https://github.com/ranjian0/building_tools/releases/download/v1.0.10/building_tools-v1.0.10.zip).
 2. In blender, go to : Edit -> Preferences -> Add-ons -> Install.
 3. Select the downloaded file and you're good to go.
 
@@ -47,7 +47,7 @@ and `Building Tools` was born.
 
 ## Status
 
-`Version` : `v1.0.9`
+`Version` : `v1.0.10`
 
 **Blender 3.0 Compatible** 
 

__init__.py

@@ -4,7 +4,7 @@
 bl_info = {
     "name": "Building Tools",
     "author": "Ian Karanja (ranjian0), Lucky Kadam (luckykadam), Marcus (MCrafterzz)",
-    "version": (1, 0, 9),
+    "version": (1, 0, 10),
     "blender": (2, 80, 0),
     "location": "View3D > Toolshelf > Building Tools",
     "description": "Building Creation Tools",
@@ -212,7 +212,6 @@ def unregister():
 
 if __name__ == "__main__":
     import os
-
     os.system("clear")
 
     # -- custom unregister for script watcher

btools/building/array.py

@@ -68,7 +68,7 @@ def spread(self, val):
 
 def clamp_array_count(face, prop):
     """Keep array count to minimum number that fits all elements in the parent face"""
-    prop.count = clamp(prop.count, 1, calc_face_dimensions(face)[0] // prop.width)
+    prop.count = clamp(prop.count, 1, int(calc_face_dimensions(face)[0] // prop.width))
 
 
 def get_array_split_edges(afaces):

btools/building/material.py

@@ -6,7 +6,7 @@
     CollectionProperty,
 )
 
-from ..utils import create_object_material, bmesh_from_active_object
+from ..utils import create_object_material
 from .facemap import (
     clear_empty_facemaps, 
     set_material_for_active_facemap,

btools/building/removegeom.py

@@ -1,5 +1,4 @@
 import bpy
-import math
 import bmesh
 from .facemap import FaceMap, add_faces_to_map
 from ..utils import (

btools/building/sizeoffset.py

@@ -136,6 +136,8 @@ def init(self, parent_dimensions, default_size=(1.0, 1.0), default_offset=(0.0,
         if self.size == Vector((0, 0)):
             self.size = default_size
             self.offset = default_offset
+        self.clamp_size()
+        self.clamp_offset()
 
     def draw(self, context, box):
 

btools/building/window/window_props.py

@@ -7,10 +7,10 @@
     PointerProperty
 )
 
-from ..fill import FillBars, FillLouver, FillGlassPanes
-from ...utils import get_scaled_unit
 from ..arch import ArchProperty
+from ...utils import get_scaled_unit 
 from ..array import ArrayProperty, ArrayGetSet
+from ..fill import FillBars, FillLouver, FillGlassPanes
 from ..sizeoffset import SizeOffsetGetSet, SizeOffsetProperty
 
 

btools/utils/util_common.py

@@ -1,8 +1,9 @@
-import traceback
-import enum
 import bpy
+import enum
 import bmesh
+import traceback
 from mathutils import Vector
+from bpy.props import PointerProperty
 from .util_constants import VEC_UP, VEC_RIGHT
 
 
@@ -135,11 +136,13 @@ def local_xyz(face):
     y = x.cross(z)
     return x, y, z
 
+
 def XYDir(vec):
     """Remove the z component from a vector and normalize"""
     vec.z = 0
     return vec.normalized() 
 
+
 def get_scaled_unit(value):
     """Mostly to scale prop values to current scene unit scale
     """
@@ -148,4 +151,27 @@ def get_scaled_unit(value):
     except AttributeError:
         # Addon Registration, context.scene is not available
         scale = 1.0
-    return value / scale
+    return value / scale
+
+
+def get_defaults(prop):
+    defaults = dict()
+    for name, data in prop.__annotations__.items():
+        if data.function == PointerProperty:
+            defaults[name] = get_defaults(getattr(prop, name))
+        else:
+            defaults[name] = data.keywords.get('default')
+
+    for name in list(defaults.keys()):
+        data = defaults[name] 
+        if isinstance(data, dict):
+            for k, v in data.items():
+                defaults[f'{name}.{k}'] = v
+            del defaults[name]
+    return defaults
+
+
+def set_defaults(prop):
+    defaults = get_defaults(prop)
+    for name, value in defaults.items():
+        setattr(prop, name, value)

btools/utils/util_geometry.py

@@ -32,8 +32,8 @@ def cone(bm, r1=0.5, r2=0.01, height=2, segs=32):
     """Create a cone in the bmesh"""
     return bmesh.ops.create_cone(
         bm,
-        diameter1=r1 * 2,
-        diameter2=r2 * 2,
+        radius1=r1,
+        radius2=r2,
         depth=height,
         cap_ends=True,
         cap_tris=True,

btools/utils/util_skeleton.py

@@ -5,8 +5,6 @@
 import heapq
 import operator as op
 import itertools as it
-
-from enum import Enum
 from collections import namedtuple
 
 

docs/_config.yml

@@ -1,11 +1,11 @@
 theme: jekyll-theme-cayman
 
 title: [Building Tools]
-description: [v1.0.9]
+description: [v1.0.10]
 
 show_downloads: true
 
 github:
-    zip_url: https://github.com/ranjian0/building_tools/releases/download/v1.0.9/building_tools-v1.0.9.zip
+    zip_url: https://github.com/ranjian0/building_tools/releases/download/v1.0.10/building_tools-v1.0.10.zip
 
 google_analytics: UA-154906120-2