From 1f52788e9d811515e14e651c5add82a17b870075 Mon Sep 17 00:00:00 2001 From: Rob Date: Sun, 15 Dec 2024 11:12:32 -0500 Subject: [PATCH] Update constants references --- scripts/addons/cam/constants.py | 6 ++++++ scripts/addons/cam/opencamlib/oclSample.py | 7 ++----- scripts/addons/cam/opencamlib/opencamlib.py | 8 ++------ scripts/addons/cam/puzzle_joinery.py | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/scripts/addons/cam/constants.py b/scripts/addons/cam/constants.py index 0093fb69..0545d267 100644 --- a/scripts/addons/cam/constants.py +++ b/scripts/addons/cam/constants.py @@ -42,3 +42,9 @@ if sys.version > "3": PY3 = True else: PY3 = False + +OCL_SCALE = 1000.0 + +PYTHON_BIN = None + +_PREVIOUS_OCL_MESH = None diff --git a/scripts/addons/cam/opencamlib/oclSample.py b/scripts/addons/cam/opencamlib/oclSample.py index beba3685..2788207a 100644 --- a/scripts/addons/cam/opencamlib/oclSample.py +++ b/scripts/addons/cam/opencamlib/oclSample.py @@ -20,13 +20,10 @@ except ImportError: import mathutils +from ..constants import OCL_SCALE, _PREVIOUS_OCL_MESH from ..simple import activate from ..exception import CamException -from ..async_op import progress_async - -OCL_SCALE = 1000.0 - -_PREVIOUS_OCL_MESH = None +from ..operators.async_op import progress_async def get_oclSTL(operation): diff --git a/scripts/addons/cam/opencamlib/opencamlib.py b/scripts/addons/cam/opencamlib/opencamlib.py index 486ad6f2..a62f95e5 100644 --- a/scripts/addons/cam/opencamlib/opencamlib.py +++ b/scripts/addons/cam/opencamlib/opencamlib.py @@ -19,17 +19,13 @@ except ImportError: import bpy -from ..constants import BULLET_SCALE +from ..constants import BULLET_SCALE, OCL_SCALE, PYTHON_BIN from ..simple import activate from .. import utils from ..cam_chunk import CamPathChunk -from ..async_op import progress_async +from ..operators.async_op import progress_async from .oclSample import get_oclSTL, ocl_sample -OCL_SCALE = 1000.0 - -PYTHON_BIN = None - def pointSamplesFromOCL(points, samples): """Update the z-coordinate of points based on corresponding sample values. diff --git a/scripts/addons/cam/puzzle_joinery.py b/scripts/addons/cam/puzzle_joinery.py index 6a1f5bac..5c48270f 100644 --- a/scripts/addons/cam/puzzle_joinery.py +++ b/scripts/addons/cam/puzzle_joinery.py @@ -20,7 +20,7 @@ from . import ( utils, ) -from .constansts import DT +from .constants import DT def finger(diameter, stem=2):