From 0190005164cd4bb983d520f80ffee9e409ad608e Mon Sep 17 00:00:00 2001 From: Dealga McArdle Date: Wed, 7 Apr 2021 10:47:00 +0200 Subject: [PATCH] update bpy for 2.93+ (#4025) --- core/monad.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/monad.py b/core/monad.py index 4bc9fe4364..a9c683e529 100644 --- a/core/monad.py +++ b/core/monad.py @@ -32,10 +32,11 @@ from sverchok.core.update_system import make_tree_from_nodes, do_update from sverchok.core.monad_properties import SvIntPropertySettingsGroup, SvFloatPropertySettingsGroup, ensure_unique from sverchok.core.events import CurrentEvents, BlenderEventsTypes -from sverchok.utils.handle_blender_data import get_sv_trees +from sverchok.utils.handle_blender_data import get_sv_trees, get_func_and_args from sverchok.utils.sv_json_export import JSONExporter from sverchok.utils.sv_json_import import JSONImporter + MONAD_COLOR = (0.830819, 0.911391, 0.754562) @@ -211,7 +212,12 @@ def add_prop_from(self, socket): if other.prop_name: prop_name = other.prop_name - prop_func, prop_dict = other.node.__annotations__.get(prop_name, ("", {})) + + try: + prop_func, prop_dict = get_func_and_args(other.node.__annotations__[prop_name]) + except: + prop_func, prop_dict = ("", {}) + if 'attr' in prop_dict: prop_dict.pop('attr') # this we store in prop_name anyway