Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'archipack')
-rw-r--r--archipack/__init__.py4
-rw-r--r--archipack/archipack_autoboolean.py2
-rw-r--r--archipack/archipack_floor.py2
-rw-r--r--archipack/archipack_gl.py3
-rw-r--r--archipack/archipack_roof.py2
-rw-r--r--archipack/archipack_thumbs.py6
-rw-r--r--archipack/archipack_wall2.py2
-rw-r--r--archipack/archipack_window.py12
-rw-r--r--archipack/bmesh_utils.py4
9 files changed, 18 insertions, 19 deletions
diff --git a/archipack/__init__.py b/archipack/__init__.py
index 0f5d3a86..8b87585b 100644
--- a/archipack/__init__.py
+++ b/archipack/__init__.py
@@ -504,12 +504,12 @@ def register():
bpy.utils.register_class(Archipack_Pref)
update_panel(None, bpy.context)
bpy.utils.register_class(ARCHIPACK_MT_create)
- bpy.types.INFO_MT_mesh_add.append(menu_func)
+ bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
def unregister():
global icons_collection
- bpy.types.INFO_MT_mesh_add.remove(menu_func)
+ bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
bpy.utils.unregister_class(ARCHIPACK_MT_create)
bpy.utils.unregister_class(TOOLS_PT_Archipack_Tools)
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_floor.py b/archipack/archipack_floor.py
index 8664b637..a367470e 100644
--- a/archipack/archipack_floor.py
+++ b/archipack/archipack_floor.py
@@ -337,7 +337,7 @@ class FloorGenerator(CutAblePolygon, CutAbleGenerator):
segments=1, # d.bevel_res
profile=0.5,
vertex_only=False,
- clamp_overlap=False,
+ clight_overlap=False,
material=-1)
bm.to_mesh(o.data)
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_roof.py b/archipack/archipack_roof.py
index aba6f12e..d848d170 100644
--- a/archipack/archipack_roof.py
+++ b/archipack/archipack_roof.py
@@ -1868,7 +1868,7 @@ class RoofGenerator(CutAbleGenerator):
segments=d.tile_bevel_segs,
profile=0.5,
vertex_only=False,
- clamp_overlap=True,
+ clight_overlap=True,
material=-1)
if d.tile_solidify:
diff --git a/archipack/archipack_thumbs.py b/archipack/archipack_thumbs.py
index 8f652ab2..bfc9d55e 100644
--- a/archipack/archipack_thumbs.py
+++ b/archipack/archipack_thumbs.py
@@ -111,7 +111,7 @@ def generateThumb(context, cls, preset):
p.data.materials.append(m)
# add 3 lights
- bpy.ops.object.lamp_add(
+ bpy.ops.object.light_add(
type='POINT',
radius=1,
view_align=False,
@@ -123,7 +123,7 @@ def generateThumb(context, cls, preset):
emit = nodes["Emission"]
emit.inputs[1].default_value = 2000.0
- bpy.ops.object.lamp_add(
+ bpy.ops.object.light_add(
type='POINT',
radius=1,
view_align=False,
@@ -137,7 +137,7 @@ def generateThumb(context, cls, preset):
falloff.inputs[0].default_value = 5
tree.links.new(falloff.outputs[2], emit.inputs[1])
- bpy.ops.object.lamp_add(
+ bpy.ops.object.light_add(
type='POINT',
radius=1,
view_align=False,
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/archipack/archipack_window.py b/archipack/archipack_window.py
index 3524fbbf..167a27fc 100644
--- a/archipack/archipack_window.py
+++ b/archipack/archipack_window.py
@@ -993,7 +993,7 @@ class archipack_window(ArchipackObject, Manipulable, PropertyGroup):
def find_portal(self, o):
for child in o.children:
- if child.type == 'LAMP':
+ if child.type == 'LIGHT':
return child
return None
@@ -1002,7 +1002,7 @@ class archipack_window(ArchipackObject, Manipulable, PropertyGroup):
lamp = self.find_portal(o)
if self.portal:
if lamp is None:
- bpy.ops.object.lamp_add(type='AREA')
+ bpy.ops.object.light_add(type='AREA')
lamp = context.active_object
lamp.name = "Portal"
lamp.parent = o
@@ -1025,7 +1025,7 @@ class archipack_window(ArchipackObject, Manipulable, PropertyGroup):
d = lamp.data
context.scene.objects.unlink(lamp)
bpy.data.objects.remove(lamp)
- bpy.data.lamps.remove(d)
+ bpy.data.lights.remove(d)
context.scene.objects.active = o
@@ -1658,7 +1658,7 @@ class ARCHIPACK_PT_window(Panel):
box.prop(prop, 'hole_inside_mat')
box.prop(prop, 'hole_outside_mat')
- layout.prop(prop, 'portal', icon="LAMP_AREA")
+ layout.prop(prop, 'portal', icon="LIGHT_AREA")
class ARCHIPACK_PT_window_panel(Panel):
@@ -1751,11 +1751,11 @@ class ARCHIPACK_OT_window(ArchipackCreateTool, Operator):
if archipack_window.filter(o):
bpy.ops.archipack.disable_manipulate()
for child in o.children:
- if child.type == 'LAMP':
+ if child.type == 'LIGHT':
d = child.data
context.scene.objects.unlink(child)
bpy.data.objects.remove(child)
- bpy.data.lamps.remove(d)
+ bpy.data.lights.remove(d)
elif 'archipack_hole' in child:
context.scene.objects.unlink(child)
bpy.data.objects.remove(child, do_unlink=True)
diff --git a/archipack/bmesh_utils.py b/archipack/bmesh_utils.py
index 3f402d1d..1157d9a3 100644
--- a/archipack/bmesh_utils.py
+++ b/archipack/bmesh_utils.py
@@ -216,7 +216,7 @@ class BmeshEdit():
segments=1,
profile=0.5,
vertex_only=False,
- clamp_overlap=True,
+ clight_overlap=True,
material=-1,
use_selection=True):
"""
@@ -245,7 +245,7 @@ class BmeshEdit():
segments=segments,
profile=profile,
vertex_only=vertex_only,
- clamp_overlap=clamp_overlap,
+ clight_overlap=clight_overlap,
material=material)
bm.to_mesh(o.data)