revert project pocket changes

pull/194/head
abosafia 2021-08-14 07:33:32 +02:00
rodzic 68ea96a7bf
commit bec380e61e
3 zmienionych plików z 1 dodań i 13 usunięć

Wyświetl plik

@ -446,10 +446,6 @@ class camOperation(bpy.types.PropertyGroup):
default=False)
object_name: bpy.props.StringProperty(name='Object', description='object handled by this operation',
update=updateOperationValid)
project_curve_name: bpy.props.StringProperty(name='project pocket curve', description='curve to pocket and project',
update=updateOperationValid)
project_pocket_to_object: bpy.props.BoolProperty(name="Projcet to object", description="Give pocket a 3d style", default=False,
update=updateRest)
collection_name: bpy.props.StringProperty(name='Collection', description='Object collection handled by this operation',
update=updateOperationValid)
curve_object: bpy.props.StringProperty(name='Curve source',

Wyświetl plik

@ -462,8 +462,6 @@ def pocket(o):
ch.points.extend(rothelix)
chunks.extend(lchunks)
if o.project_pocket_to_object == True:
return chunks
if o.ramp:
for ch in chunks:

Wyświetl plik

@ -523,10 +523,6 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMButtonsPanel, bpy.types.Panel):
if ao.strategy in ['BLOCK', 'SPIRAL', 'CIRCLES', 'OUTLINEFILL']:
layout.prop(ao, 'movement_insideout')
if ao.strategy=='OUTLINEFILL':
layout.prop(ao, 'project_pocket_to_object')
if ao.project_pocket_to_object:
layout.prop_search(ao, "project_curve_name", bpy.data, "objects")
# if ao.geometry_source=='OBJECT' or ao.geometry_source=='COLLECTION':
@ -803,9 +799,7 @@ class CAM_OPTIMISATION_Panel(CAMButtonsPanel, bpy.types.Panel):
if ao.optimize:
layout.prop(ao, 'optimize_threshold')
if ao.geometry_source == 'OBJECT' or ao.geometry_source == 'COLLECTION':
exclude_exact = ao.strategy in ['MEDIAL_AXIS', 'WATERLINE', 'CUTOUT', 'DRILL', 'PENCIL','CURVE']
if ao.strategy == 'POCKET' and not ao.project_pocket_to_object:
exclude_exact = True
exclude_exact = ao.strategy in ['MEDIAL_AXIS', 'POCKET', 'WATERLINE', 'CUTOUT', 'DRILL', 'PENCIL','CURVE']
if not exclude_exact:
if ao.use_exact != True:
layout.prop(ao, 'use_exact')