diff options
author | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
---|---|---|
committer | Antonis Ryakiotakis <kalast@gmail.com> | 2022-02-07 21:37:15 +0300 |
commit | d8c05502272990173381bfd2590884bbc95aa5f5 (patch) | |
tree | 8bd65efacbe6484b838d4550597d0f4a54ddddd9 /source/blender/depsgraph/intern/node/deg_node.cc | |
parent | b64d551f3b2fa409b4eeefb641fc581eb6cd0bd6 (diff) | |
parent | fe1816f67fbc6aaf383ec77847d668367335d093 (diff) |
Merge branch 'master' into KTX_supportKTX_support
Diffstat (limited to 'source/blender/depsgraph/intern/node/deg_node.cc')
-rw-r--r-- | source/blender/depsgraph/intern/node/deg_node.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 075bfd35ec1..1eb76d76c22 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -67,8 +67,6 @@ const char *nodeTypeAsString(NodeType type) /* **** Outer Types **** */ case NodeType::PARAMETERS: return "PARAMETERS"; - case NodeType::PROXY: - return "PROXY"; case NodeType::ANIMATION: return "ANIMATION"; case NodeType::TRANSFORM: @@ -174,7 +172,6 @@ eDepsSceneComponentType nodeTypeToSceneComponent(NodeType type) case NodeType::BONE: case NodeType::SHADING: case NodeType::CACHE: - case NodeType::PROXY: case NodeType::SIMULATION: case NodeType::NTREE_OUTPUT: return DEG_SCENE_COMP_PARAMETERS; @@ -194,8 +191,6 @@ NodeType nodeTypeFromObjectComponent(eDepsObjectComponentType component_type) return NodeType::UNDEFINED; case DEG_OB_COMP_PARAMETERS: return NodeType::PARAMETERS; - case DEG_OB_COMP_PROXY: - return NodeType::PROXY; case DEG_OB_COMP_ANIMATION: return NodeType::ANIMATION; case DEG_OB_COMP_TRANSFORM: @@ -219,8 +214,6 @@ eDepsObjectComponentType nodeTypeToObjectComponent(NodeType type) switch (type) { case NodeType::PARAMETERS: return DEG_OB_COMP_PARAMETERS; - case NodeType::PROXY: - return DEG_OB_COMP_PROXY; case NodeType::ANIMATION: return DEG_OB_COMP_ANIMATION; case NodeType::TRANSFORM: |