blender/blender-addons
19
43
Fork 96
Code Issues 634 Pull Requests 27 Projects 1 Releases Wiki Activity

Archimesh: fix floor creation #104446

Merged
Damien Picard merged 1 commits from pioverfour/blender-addons:dp_archimesh_fix_mods into blender-v3.5-release 2023-02-28 10:40:00 +01:00
Conversation 4 Commits 1 Files Changed 2 +26 -29
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archimesh/__init__.py
View File

@ -11,7 +11,7 @@ bl_info = {
"name": "Archimesh", "name": "Archimesh",
"author": "Antonio Vazquez (antonioya)", "author": "Antonio Vazquez (antonioya)",
"location": "View3D > Add Mesh / Sidebar > Create Tab", "location": "View3D > Add Mesh / Sidebar > Create Tab",
"version": (1, 2, 3), "version": (1, 2, 4),
"blender": (3, 0, 0), "blender": (3, 0, 0),
"description": "Generate rooms, doors, windows, and other architecture objects", "description": "Generate rooms, doors, windows, and other architecture objects",
"doc_url": "{BLENDER_MANUAL_URL}/addons/add_mesh/archimesh.html", "doc_url": "{BLENDER_MANUAL_URL}/addons/add_mesh/archimesh.html",

53
archimesh/achm_tools.py
View File

@ -174,10 +174,9 @@ def set_modifier_solidify(myobject, width):
def set_modifier_boolean(myobject, bolobject): def set_modifier_boolean(myobject, bolobject):
bpy.context.view_layer.objects.active = myobject bpy.context.view_layer.objects.active = myobject
if bpy.context.view_layer.objects.active.name == myobject.name: if bpy.context.view_layer.objects.active.name == myobject.name:
bpy.ops.object.modifier_add(type='BOOLEAN') boolean_modifier = context.object.modifiers.new("", 'BOOLEAN')
mod = myobject.modifiers[len(myobject.modifiers) - 1] boolean_modifier.operation = 'DIFFERENCE'
mod.operation = 'DIFFERENCE' boolean_modifier.object = bolobject
mod.object = bolobject
# -------------------------------------------------------------------- # --------------------------------------------------------------------
@ -709,40 +708,38 @@ def create_brick_material(matname, replace, r, g, b, rv=0.8, gv=0.636, bv=0.315)
nodes = mat.node_tree.nodes nodes = mat.node_tree.nodes
# support for multilanguage # support for multilanguage
node = nodes[get_node_index(nodes, 'BSDF_DIFFUSE')] principled_node = nodes[get_node_index(nodes, 'BSDF_PRINCIPLED')]
node.name = 'Diffuse BSDF'
node.label = 'Diffuse BSDF'
node.inputs[0].default_value = [r, g, b, 1] principled_node.inputs[0].default_value = [r, g, b, 1]
node.location = 500, 160 principled_node.location = 500, 160
node = nodes[get_node_index(nodes, 'OUTPUT_MATERIAL')] output_node = nodes[get_node_index(nodes, 'OUTPUT_MATERIAL')]
node.location = 700, 160 output_node.location = 700, 160
node = nodes.new('ShaderNodeTexBrick') brick_node = nodes.new('ShaderNodeTexBrick')
node.name = 'Brick_0' brick_node.name = 'Brick_0'
node.inputs[3].default_value = [0.407, 0.411, 0.394, 1] # mortar color brick_node.inputs[3].default_value = [0.407, 0.411, 0.394, 1] # mortar color
node.inputs[4].default_value = 3 # scale brick_node.inputs[4].default_value = 3 # scale
node.inputs[5].default_value = 0.001 # mortar brick_node.inputs[5].default_value = 0.001 # mortar
node.inputs[7].default_value = 0.60 # size_w brick_node.inputs[7].default_value = 0.60 # size_w
node.inputs[8].default_value = 0.30 # size_h brick_node.inputs[8].default_value = 0.30 # size_h
node.location = 300, 160 brick_node.location = 300, 160
node = nodes.new('ShaderNodeRGB') rgb_node = nodes.new('ShaderNodeRGB')
node.name = 'RGB_0' rgb_node.name = 'RGB_0'
node.outputs[0].default_value = [r, g, b, 1] rgb_node.outputs[0].default_value = [r, g, b, 1]
node.location = 70, 160 rgb_node.location = 70, 160
# Connect nodes # Connect nodes
outn = nodes['RGB_0'].outputs['Color'] outn = rgb_node.outputs['Color']
inn = nodes['Brick_0'].inputs['Color1'] inn = brick_node.inputs['Color1']
mat.node_tree.links.new(outn, inn) mat.node_tree.links.new(outn, inn)
inn = nodes['Brick_0'].inputs['Color2'] inn = brick_node.inputs['Color2']
mat.node_tree.links.new(outn, inn) mat.node_tree.links.new(outn, inn)
outn = nodes['Brick_0'].outputs['Color'] outn = brick_node.outputs['Color']
inn = nodes['Diffuse BSDF'].inputs['Color'] inn = principled_node.inputs['Base Color']
mat.node_tree.links.new(outn, inn) mat.node_tree.links.new(outn, inn)
return mat return mat