mirror
/
blendercam
kopia lustrzana https://github.com/vilemduha/blendercam
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'pppalain:master' into master

pull/248/head
migo1001 2023-06-18 14:12:55 +02:00 zatwierdzone przez GitHub
rodzic 9a92deaab0 504f97f866
commit 3ecca5192c
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 2 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
scripts/addons/cam/__init__.py
Wyświetl plik

@ -510,7 +510,7 @@ class camOperation(bpy.types.PropertyGroup):
('IMAGE', 'Image', 'a')),
description='Geometry source',
default='OBJECT', update=updateOperationValid)
cutter_typeb: EnumProperty(name='Cutter',
cutter_type: EnumProperty(name='Cutter',
items=(
('END', 'End', 'end - flat cutter'),
('BALLNOSE', 'Ballnose', 'ballnose cutter'),
@ -523,18 +523,6 @@ class camOperation(bpy.types.PropertyGroup):
('CUSTOM', 'Custom-EXPERIMENTAL', 'modelled cutter - not well tested yet.')),
description='Type of cutter used',
default='END', update=updateZbufferImage)
cutter_type: EnumProperty(name='Cutter',
items=(
('END', 'End', 'end - flat cutter'),
('BALLNOSE', 'Ballnose', 'ballnose cutter'),
('BULLNOSE', 'Bullnose', 'bullnose cutter ***placeholder **'),
('VCARVE', 'V-carve', 'v carve cutter'),
('BALLCONE', 'Ballcone', 'Ball with a Cone for Parallel - X'),
('CYLCONE', 'Cylinder cone', 'Cylinder end with a Cone for Parallel - X'),
('CUSTOM', 'Custom-EXPERIMENTAL', 'modelled cutter - not well tested yet.')),
description='Type of cutter used',
default='END', update=updateZbufferImage)
cutter_object_name: bpy.props.StringProperty(name='Cutter object',
description='object used as custom cutter for this operation',
update=updateZbufferImage)

5
scripts/addons/cam/ui_panels/cutter.py
Wyświetl plik

@ -44,10 +44,7 @@ class CAM_CUTTER_Panel(CAMButtonsPanel, bpy.types.Panel):
row.operator("render.cam_preset_cutter_add", text="", icon='ADD')
row.operator("render.cam_preset_cutter_add", text="", icon='REMOVE').remove_active = True
layout.prop(ao, 'cutter_id')
if ao.strategy == "POCKET" or ao.strategy == "CUTOUT" :
layout.prop(ao, 'cutter_typeb')
else:
layout.prop(ao, 'cutter_type')
layout.prop(ao, 'cutter_type')
if ao.cutter_type == 'VCARVE':
layout.prop(ao, 'cutter_tip_angle')
if ao.cutter_type == 'BALLCONE':