Scene handler (#4299)

add new scene handler should update nodes reading data from Blender upon changes in the scene * remove update live mode * Remove AnimatableNode mix-in class and create is_animation_dependent property instead. Also add is_scene_dependent property which handled nodes to be updated upon user changes in scene

Scene handler (#4299)
add new scene handler should update nodes reading data from Blender upon changes in the scene * remove update live mode * Remove AnimatableNode mix-in class and create is_animation_dependent property instead. Also add is_scene_dependent property which handled nodes to be updated upon user changes in scene
6019f8e8 · Sergey · GitHub · 86957d45 · 6019f8e8 · 6019f8e8
--- a/nodes/object_nodes/copy_modifiers.py
+++ b/nodes/object_nodes/copy_modifiers.py
@@ -10,11 +10,10 @@ import bpy
 from sverchok.data_structure import repeat_last
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.utils.handle_blender_data import BlModifier
-class SvCopyModifiersNode(SvAnimatableNode, SverchCustomTreeNode, bpy.types.Node):
+class SvCopyModifiersNode(SverchCustomTreeNode, bpy.types.Node):
    """
    Triggers: modifiers
    Tooltip:
@@ -23,12 +22,22 @@ class SvCopyModifiersNode(SvAnimatableNode, SverchCustomTreeNode, bpy.types.Node
    bl_label = 'Copy Modifiers'
    bl_icon = 'MODIFIER_DATA'
+    @property
+    def is_scene_dependent(self):
+        return (not self.inputs['Objects'].is_linked) and (self.inputs['Objects'].object_ref_pointer
+                                                           or self.object_names)
+    @property
+    def is_animation_dependent(self):
+        return (not self.inputs['Objects'].is_linked) and (self.inputs['Objects'].object_ref_pointer
+                                                           or self.object_names)
    def sv_init(self, context):
        self.inputs.new('SvObjectSocket', 'Object To')
        self.inputs.new('SvObjectSocket', 'Object From')
        self.outputs.new('SvObjectSocket', 'Object')
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
        self.draw_animatable_buttons(layout)
    def process(self):

--- a/nodes/object_nodes/custom_mesh_normals.py
+++ b/nodes/object_nodes/custom_mesh_normals.py
@@ -20,18 +20,25 @@
 import bpy
 from bpy.props import EnumProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, second_as_first_cycle as safc)
-class SvSetCustomMeshNormals(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvSetCustomMeshNormals(bpy.types.Node, SverchCustomTreeNode):
    ''' Set custom normals for verts or loops '''
    bl_idname = 'SvSetCustomMeshNormals'
    bl_label = 'Set Custom Normals'
    bl_icon = 'SNAP_NORMAL'
    sv_icon = 'SV_CUSTOM_NORMALS'
+    @property
+    def is_scene_dependent(self):
+        return (not self.inputs['Objects'].is_linked) and self.inputs['Objects'].object_ref_pointer
+    @property
+    def is_animation_dependent(self):
+        return (not self.inputs['Objects'].is_linked) and self.inputs['Objects'].object_ref_pointer
    modes = [
        ("per_Vert", "per Vert", "", 1),
        ("per_Loop", "per Loop", "", 2)
@@ -39,8 +46,7 @@ class SvSetCustomMeshNormals(bpy.types.Node, SverchCustomTreeNode, SvAnimatableN
    mode: EnumProperty(items=modes, default='per_Vert', update=updateNode)
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, "mode", expand=True)
    def sv_init(self, context):

--- a/nodes/object_nodes/get_asset_properties_mk2.py
+++ b/nodes/object_nodes/get_asset_properties_mk2.py
@@ -8,7 +8,6 @@
 import bpy
 from bpy.props import EnumProperty, PointerProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, no_space, enum_item as e)
 def frame_from_available(idx, layer):
@@ -48,12 +47,14 @@ def frame_from_available2(current_frame, layer):
    return inp_to_index.get(tval, 0)
-class SvGetAssetPropertiesMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvGetAssetPropertiesMK2(bpy.types.Node, SverchCustomTreeNode):
    ''' Get Asset Props '''
    bl_idname = 'SvGetAssetPropertiesMK2'
    bl_label = 'Object ID Selector+'
    bl_icon = 'SELECT_SET'
    sv_icon = 'SV_OBJECT_ID_SELECTOR'
+    is_scene_dependent = True
+    is_animation_dependent = True
    def type_filter(self, object):
        return object.type == self.Type
@@ -196,9 +197,8 @@ class SvGetAssetPropertiesMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatable
        else:
            return data_list[:]
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
        # layout.operator('node.'   ,text='refresh from scene')
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.row().prop(self, "Mode", text="data")
        if self.Mode == 'objects':

--- a/nodes/object_nodes/getsetprop.py
+++ b/nodes/object_nodes/getsetprop.py
@@ -26,7 +26,6 @@ import mathutils
 from mathutils import Matrix, Vector, Euler, Quaternion, Color
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import Matrix_generate, updateNode, node_id
@@ -158,12 +157,14 @@ def secondary_type_assesment(item):
            return "SvColorSocket"
    return None
-class SvGetPropNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvGetPropNode(bpy.types.Node, SverchCustomTreeNode):
    ''' Get property '''
    bl_idname = 'SvGetPropNode'
    bl_label = 'Get property'
    bl_icon = 'FORCE_VORTEX'
    sv_icon = 'SV_PROP_GET'
+    is_animation_dependent = True
+    is_scene_dependent = True
    bad_prop: BoolProperty(default=False)
@@ -198,10 +199,8 @@ class SvGetPropNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
        path = parse_to_path(ast_path.body[0].value)
        return get_object(path)
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
        layout.alert = self.bad_prop
-        if len(self.outputs) > 0:
-            self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, "prop_name", text="")
    def process(self):

--- a/nodes/object_nodes/getsetprop_mk2.py
+++ b/nodes/object_nodes/getsetprop_mk2.py
@@ -26,7 +26,6 @@ import mathutils
 from mathutils import Matrix, Vector, Euler, Quaternion, Color
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import Matrix_generate, updateNode, node_id
@@ -221,13 +220,21 @@ class SvPropNodeMixin():
    prop_name: StringProperty(name='', update=verify_prop)
-class SvGetPropNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvPropNodeMixin, SvAnimatableNode):
+class SvGetPropNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvPropNodeMixin):
    ''' Get property '''
    bl_idname = 'SvGetPropNodeMK2'
    bl_label = 'Get property MK2'
    bl_icon = 'FORCE_VORTEX'
    sv_icon = 'SV_PROP_GET'
+    @property
+    def is_scene_dependent(self):
+        return bool(self.outputs)
+    @property
+    def is_animation_dependent(self):
+        return bool(self.outputs)
    def execute_inside_throttle(self):  # the name of the method does not have any meaning now
        s_type = self.type_assesment()
@@ -237,8 +244,7 @@ class SvGetPropNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvPropNodeMixin, Sv
        elif s_type:
            outputs.new(s_type, "Data")
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.alert = self.bad_prop
        layout.prop(self, "prop_name", text="")

--- a/nodes/object_nodes/lattice_analyzer.py
+++ b/nodes/object_nodes/lattice_analyzer.py
@@ -18,16 +18,15 @@
 import bpy
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
-from sverchok.data_structure import updateNode
+class SvLatticePropsNode(bpy.types.Node, SverchCustomTreeNode):
-class SvLatticePropsNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
    '''Lattice object props'''
    bl_idname = 'SvLatticePropsNode'
    bl_label = 'Lattice Props'
    bl_icon = 'MOD_LATTICE'
+    is_scene_dependent = True
+    is_animation_dependent = True
    def sv_init(self, context):
        self.inputs.new('SvObjectSocket', 'Lattice Object')
@@ -37,9 +36,6 @@ class SvLatticePropsNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode)
        self.outputs.new('SvVerticesSocket', 'deformed points')
        self.outputs.new('SvObjectSocket', "Lattice Object")
-    def draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
    def process(self):
        lattobj, dep, selm = self.inputs
        Oorp, Odep, obj = self.outputs

--- a/nodes/object_nodes/material_index.py
+++ b/nodes/object_nodes/material_index.py
@@ -22,12 +22,11 @@ import bpy
 from bpy.props import IntProperty, BoolProperty, EnumProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, match_long_repeat, fullList, get_data_nesting_level,
                                     describe_data_shape)
-class SvMaterialIndexNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvMaterialIndexNode(bpy.types.Node, SverchCustomTreeNode):
    '''
    Triggers: material index
    Tooltip: Set material index per object face
@@ -37,6 +36,14 @@ class SvMaterialIndexNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode
    bl_label = "Set Material Index"
    bl_icon = 'MATERIAL'
+    @property
+    def is_scene_dependent(self):
+        return (not self.inputs['Object'].is_linked) and self.inputs['Object'].object_ref_pointer
+    @property
+    def is_animation_dependent(self):
+        return (not self.inputs['Object'].is_linked) and self.inputs['Object'].object_ref_pointer
    def update_all_faces(self, context):
        self.inputs['FaceIndex'].hide_safe = self.all_faces
        updateNode(self, context)
@@ -68,8 +75,7 @@ class SvMaterialIndexNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode
            default = 'FACE',
            update = updateNode)
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, "all_faces", toggle=True)
        if self.all_faces:
            layout.prop(self, "matching_mode", text='')

--- a/nodes/object_nodes/object_raycast2.py
+++ b/nodes/object_nodes/object_raycast2.py
@@ -17,12 +17,10 @@
 # ##### END GPL LICENSE BLOCK #####
 import bpy
-import mathutils
 from mathutils import Vector
 from mathutils.bvhtree import BVHTree
 from bpy.props import BoolProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, match_long_repeat)
@@ -49,12 +47,14 @@ class FakeObj(object):
            return [True, tv[0], tv[1], tv[2]]
-class SvOBJRayCastNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvOBJRayCastNodeMK2(bpy.types.Node, SverchCustomTreeNode):
    ''' RayCast Object '''
    bl_idname = 'SvOBJRayCastNodeMK2'
    bl_label = 'Object ID Raycast MK2'  # new is nonsense name
    bl_icon = 'OUTLINER_OB_EMPTY'
    sv_icon = 'SV_RAYCASTER_OBJECT_ID'
+    is_animation_dependent = True
+    is_scene_dependent = True
    mode: BoolProperty(name='input mode', default=False, update=updateNode)
    mode2: BoolProperty(name='output mode', default=False, update=updateNode)
@@ -69,15 +69,11 @@ class SvOBJRayCastNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode
        so('SvVerticesSocket', "HitNorm")
        so('SvStringsSocket', "FaceINDEX")
        # self.inputs[2].prop[2] = -1  # z down   # <--- mayybe?
-    def draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
-    def draw_buttons_ext(self, context, layout):
+    def sv_draw_buttons_ext(self, context, layout):
        row = layout.row(align=True)
        row.prop(self,    "mode",   text="In Mode")
        row.prop(self,    "mode2",   text="Out Mode")
-        self.draw_animatable_buttons(layout)
    def process(self):
        o,s,e = self.inputs

--- a/nodes/object_nodes/points_from_uv_to_mesh.py
+++ b/nodes/object_nodes/points_from_uv_to_mesh.py
@@ -23,7 +23,6 @@ from mathutils.geometry import barycentric_transform
 import numpy as np
 from bpy.props import BoolProperty, StringProperty, FloatVectorProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode)
@@ -52,17 +51,16 @@ def UV(self, object):
    return [vertices_new, polygons_new]
-class SvUVPointonMeshNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvUVPointonMeshNode(bpy.types.Node, SverchCustomTreeNode):
    ''' Transform vectors from UV space to Object space '''
    bl_idname = 'SvUVPointonMeshNode'
    bl_label = 'Find UV Coord on Surface'
    bl_icon = 'GROUP_UVS'
+    is_scene_dependent = True
+    is_animation_dependent = True
    object_ref: StringProperty(default='', update=updateNode)
-    def draw_buttons(self, context,   layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
    def sv_init(self, context):
        si, so = self.inputs.new, self.outputs.new
        si('SvObjectSocket', 'Mesh Object')

--- a/nodes/object_nodes/sample_uv_color.py
+++ b/nodes/object_nodes/sample_uv_color.py
@@ -22,21 +22,21 @@ from mathutils.geometry import barycentric_transform
 import numpy as np
 from bpy.props import BoolProperty, StringProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.core.handlers import get_sv_depsgraph, set_sv_depsgraph_need
 from sverchok.data_structure import (updateNode)
-class SvSampleUVColorNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvSampleUVColorNode(bpy.types.Node, SverchCustomTreeNode):
    ''' Sample pixel color on UV texture from surface'''
    bl_idname = 'SvSampleUVColorNode'
    bl_label = 'Sample UV Color'
    bl_icon = 'UV'
+    is_animation_dependent = True
+    is_scene_dependent = True
    image: StringProperty(default='', update=updateNode)
-    def draw_buttons(self, context,   layout):
+    def sv_draw_buttons(self, context,   layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        ob = self.inputs[0].sv_get(default=[[]])[0]
        if ob and ob.type == 'MESH':
            layout.prop_search(self, 'image', bpy.data, "images", text="")

--- a/nodes/object_nodes/scene_raycast2.py
+++ b/nodes/object_nodes/scene_raycast2.py
@@ -18,16 +18,17 @@
 import bpy
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, match_long_repeat)
-class SvSCNRayCastNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvSCNRayCastNodeMK2(bpy.types.Node, SverchCustomTreeNode):
    ''' RayCast Scene '''
    bl_idname = 'SvSCNRayCastNodeMK2'
    bl_label = 'Scene Raycast MK2' #new is nonsense name
    bl_icon = 'OUTLINER_OB_EMPTY'
    sv_icon = 'SV_RAYCASTER_SCENE'
+    is_scene_dependent = True
+    is_animation_dependent = True
    def sv_init(self, context):
        si,so = self.inputs.new,self.outputs.new
@@ -40,9 +41,6 @@ class SvSCNRayCastNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode
        so("SvObjectSocket", "Objects")
        so("SvMatrixSocket", "hited object matrix")
-    def draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
    def process(self):
        P,N,S,I,O,M = self.outputs
        rc = []

--- a/nodes/object_nodes/select_mesh_verts.py
+++ b/nodes/object_nodes/select_mesh_verts.py
@@ -21,15 +21,16 @@ import bpy
 import numpy as np
 from bpy.props import StringProperty, BoolProperty, EnumProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, second_as_first_cycle as safc)
-class SvSelectMeshVerts(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvSelectMeshVerts(bpy.types.Node, SverchCustomTreeNode):
    ''' Select vertices of mesh objects '''
    bl_idname = 'SvSelectMeshVerts'
    bl_label = 'Select Object Vertices'
    bl_icon = 'EDITMODE_HLT'
+    is_animation_dependent = True
+    is_scene_dependent = True
    formula: StringProperty(name='formula', default='val == 0', update=updateNode)
    deselect_all: BoolProperty(name='deselect', default=False, update=updateNode)
@@ -41,8 +42,7 @@ class SvSelectMeshVerts(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
    mode: EnumProperty(items=modes, default='vertices', update=updateNode)
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, "deselect_all", text="clear selection")
        layout.prop(self, "mode", expand=True)
        if self.inputs[4].is_linked:

--- a/nodes/object_nodes/set_blenddata2.py
+++ b/nodes/object_nodes/set_blenddata2.py
@@ -18,10 +18,8 @@
 import bpy
-from mathutils import Matrix
 from bpy.props import StringProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, second_as_first_cycle as safc)
@@ -30,7 +28,7 @@ from sverchok.data_structure import (updateNode, second_as_first_cycle as safc)
 # pylint: disable=w0613
-class SvSetDataObjectNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvSetDataObjectNodeMK2(bpy.types.Node, SverchCustomTreeNode):
    """
    Triggers: obj id set data
    Tooltip: Set Object Properties
@@ -41,11 +39,12 @@ class SvSetDataObjectNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableN
    bl_label = 'Object ID Set MK2'
    bl_icon = 'OUTLINER_OB_EMPTY'
    sv_icon = 'SV_OBJECT_ID_SET'
+    is_scene_dependent = True
+    is_animation_dependent = True
    formula: StringProperty(name='formula', default='delta_location', update=updateNode)
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, "formula", text="")
    def sv_init(self, context):

--- a/nodes/object_nodes/set_custom_uv_map.py
+++ b/nodes/object_nodes/set_custom_uv_map.py
@@ -13,7 +13,6 @@ import bpy
 from mathutils import Vector
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import updateNode, repeat_last
 from sverchok.utils.sv_bmesh_utils import bmesh_from_edit_mesh
@@ -68,7 +67,7 @@ def set_uv_edit_mode(verts: list, faces: list, mesh: bpy.types.Mesh, uv_name: st
                bml[uv_layer].uv = uv
-class SvSetCustomUVMap(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvSetCustomUVMap(bpy.types.Node, SverchCustomTreeNode):
    """
    Triggers: Set custom UV map to Blender mesh
@@ -79,11 +78,18 @@ class SvSetCustomUVMap(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
    bl_label = 'Set custom UV map'
    bl_icon = 'GROUP_UVS'
+    @property
+    def is_scene_dependent(self):
+        return (not self.inputs['Objects'].is_linked) and self.inputs['Objects'].object_ref_pointer
+    @property
+    def is_animation_dependent(self):
+        return (not self.inputs['Objects'].is_linked) and self.inputs['Objects'].object_ref_pointer
    uv_name: bpy.props.StringProperty(name='Uv name', default='SVMap', description='Name of UV layer',
                                      update=updateNode)
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, 'uv_name', text='', icon='GROUP_UVS')
    def sv_init(self, context):

--- a/nodes/object_nodes/weightsmk2.py
+++ b/nodes/object_nodes/weightsmk2.py
@@ -19,27 +19,27 @@
 import bpy
 from bpy.props import StringProperty, BoolProperty, FloatProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import (updateNode, second_as_first_cycle)
-class SvVertexGroupNodeMK2(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvVertexGroupNodeMK2(bpy.types.Node, SverchCustomTreeNode):
    ''' Vertex Group mk2'''
    bl_idname = 'SvVertexGroupNodeMK2'
    bl_label = 'Vertex group weights'
    bl_icon = 'OUTLINER_OB_EMPTY'
    sv_icon = 'SV_VERTEX_WEIGHT'
+    is_animation_dependent = True
+    is_scene_dependent = True
    fade_speed: FloatProperty(name='fade', default=2, update=updateNode)
    clear: BoolProperty(name='clear w', default=True, update=updateNode)
    group_name: StringProperty(default='Sv_VGroup', update=updateNode)
-    def draw_buttons(self, context,   layout):
+    def sv_draw_buttons(self, context,   layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, "group_name", text="")
-    def draw_buttons_ext(self, context, layout):
+    def sv_draw_buttons_ext(self, context, layout):
        lp = layout.prop
        lp(self,    "clear",   text="clear unindexed")
        lp(self, "fade_speed", text="Clearing speed")

--- a/nodes/pulga_physics/pulga_physics_lite.py
+++ b/nodes/pulga_physics/pulga_physics_lite.py
@@ -21,7 +21,6 @@ from numpy import array
 import bpy
 from bpy.props import IntProperty, StringProperty, BoolProperty, FloatProperty, FloatVectorProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import updateNode, node_id, match_long_repeat
 from sverchok.utils.pulga_physics_core import pulga_system_init
@@ -46,7 +45,7 @@ def fill_past_file(p, location):
    text.clear()
    text.write(''.join(str(p)))
-class SvPulgaPhysicsNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvPulgaPhysicsNode(bpy.types.Node, SverchCustomTreeNode):
    '''
    Triggers: Springs, Cloth
    Tooltip: Physics Engine
@@ -54,6 +53,7 @@ class SvPulgaPhysicsNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode)
    bl_idname = 'SvPulgaPhysicsNode'
    bl_label = 'Pulga Physics Lite'
    bl_icon = 'MOD_PHYSICS'
+    is_animation_dependent = True
    n_id : StringProperty()

--- a/nodes/pulga_physics/pulga_physics_solver.py
+++ b/nodes/pulga_physics/pulga_physics_solver.py
@@ -21,12 +21,11 @@ from numpy import array
 import bpy
 from bpy.props import IntProperty, StringProperty, BoolProperty, FloatProperty, FloatVectorProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import updateNode, match_long_repeat
 from sverchok.utils.pulga_physics_modular_core import pulga_system_init
-class SvPulgaPhysicsSolverNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvPulgaPhysicsSolverNode(bpy.types.Node, SverchCustomTreeNode):
    '''
    Triggers: Simulate Particles
    Tooltip: Modular Physics Engine
@@ -34,6 +33,7 @@ class SvPulgaPhysicsSolverNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatabl
    bl_idname = 'SvPulgaPhysicsSolverNode'
    bl_label = 'Pulga Physics Solver'
    bl_icon = 'MOD_PHYSICS'
+    is_animation_dependent = True
    iterations: IntProperty(
        name='Iterations', description='Number of Iterations',

--- a/nodes/scene/FCurve_in.py
+++ b/nodes/scene/FCurve_in.py
@@ -6,11 +6,8 @@
 # License-Filename: LICENSE
 import bpy
-# import mathutils
-# from mathutils import Vector
 from bpy.props import IntProperty, StringProperty, EnumProperty  # FloatProperty, BoolProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import updateNode
 from sverchok.utils.sv_operator_mixins import SvGenericCallbackWithParams
@@ -20,7 +17,7 @@ class SvFCurveMK1CB(bpy.types.Operator, SvGenericCallbackWithParams):
    bl_label = "Callback for fcurve sampler node mk1"
    bl_options = {'INTERNAL'}
-class SvFCurveInNodeMK1(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvFCurveInNodeMK1(bpy.types.Node, SverchCustomTreeNode):
    '''
    Triggers: FCurve In
    Tooltip: Get result of curve evaluated at frame x
@@ -31,6 +28,7 @@ class SvFCurveInNodeMK1(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
    bl_idname = 'SvFCurveInNodeMK1'
    bl_label = 'F-Curve In'
    bl_icon = 'FCURVE'
+    is_scene_dependent = True
    def wrapped_update(self, context):
@@ -64,8 +62,7 @@ class SvFCurveInNodeMK1(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
        self.inputs.new("SvStringsSocket", "Frame")
        self.outputs.new("SvStringsSocket", "Evaluated")
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        row = layout.row(align=True)
        row.prop_search(self, 'object_name', bpy.data, 'objects', text='', icon='OBJECT_DATA')
        row.operator("node.sv_fcurvenodemk1_callback_with_params", text='', icon="ZOOM_IN").fn_name="add_empty"

--- a/nodes/scene/collection_picker_mk1.py
+++ b/nodes/scene/collection_picker_mk1.py
@@ -8,7 +8,6 @@
 import bpy
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import updateNode
 from bpy.props import BoolProperty;
@@ -16,7 +15,8 @@ from bpy.props import BoolProperty;
 # pylint: disable=c0111
 # pylint: disable=c0103
-class SvCollectionPicker(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvCollectionPicker(bpy.types.Node, SverchCustomTreeNode):
    """
    Triggers: SvCollectionPicker
@@ -28,6 +28,8 @@ class SvCollectionPicker(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode)
    bl_idname = 'SvCollectionPicker'
    bl_label = 'Collection Picker'
    bl_icon = 'GROUP'
+    is_scene_dependent = True
+    is_animation_dependent = True
    def find_collections(self, object):
        return True
@@ -50,8 +52,7 @@ class SvCollectionPicker(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode)
    def sv_init(self, context):
        self.outputs.new("SvObjectSocket", "Objects")
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        col = layout.column()
        col.prop_search(self, 'collection', bpy.data, 'collections', text='', icon='GROUP')
        layout.prop(self, "show_all_objects")

--- a/nodes/scene/curve_in.py
+++ b/nodes/scene/curve_in.py
@@ -17,11 +17,8 @@
 # ##### END GPL LICENSE BLOCK #####
 import bpy
-import mathutils
-# from bpy.props import FloatProperty, BoolProperty
 from sverchok.node_tree import SverchCustomTreeNode
-from sverchok.utils.nodes_mixins.sv_animatable_nodes import SvAnimatableNode
 from sverchok.data_structure import updateNode
 from sverchok.utils.sv_extended_curve_utils import get_points_bezier, get_points_nurbs, offset
 from sverchok.utils.modules.range_utils import frange_count
@@ -134,11 +131,13 @@ def interpolate_radii(spline, segments, interpolation_type='LINEAR'):
    return radii
-class SvCurveInputNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
+class SvCurveInputNode(bpy.types.Node, SverchCustomTreeNode):
    ''' Curve data in '''
    bl_idname = 'SvCurveInputNode'
    bl_label = 'Curve Input'
    bl_icon = 'ROOTCURVE'
+    is_scene_dependent = True
+    is_animation_dependent = True
    object_names: bpy.props.CollectionProperty(type=bpy.types.PropertyGroup)
    mode_options = [(k, k, '', i) for i, k in enumerate(["LINEAR", "CATMUL"])]
@@ -158,8 +157,7 @@ class SvCurveInputNode(bpy.types.Node, SverchCustomTreeNode, SvAnimatableNode):
        new_o_put("SvStringsSocket", "radii")
        new_o_put("SvMatrixSocket", "matrices")
-    def draw_buttons(self, context, layout):
+    def sv_draw_buttons(self, context, layout):
-        self.draw_animatable_buttons(layout, icon_only=True)
        layout.prop(self, 'selected_mode', expand=True)
    def get_objects(self):