diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/depsgraph/intern/node/deg_node.cc | |
parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/depsgraph/intern/node/deg_node.cc')
-rw-r--r-- | source/blender/depsgraph/intern/node/deg_node.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 16089ba27dd..8bc03d8b736 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -94,8 +94,6 @@ const char *nodeTypeAsString(NodeType type) return "PARTICLE_SETTINGS"; case NodeType::SHADING: return "SHADING"; - case NodeType::SHADING_PARAMETERS: - return "SHADING_PARAMETERS"; case NodeType::CACHE: return "CACHE"; case NodeType::POINT_CACHE: @@ -114,6 +112,8 @@ const char *nodeTypeAsString(NodeType type) return "ARMATURE"; case NodeType::GENERIC_DATABLOCK: return "GENERIC_DATABLOCK"; + case NodeType::VISIBILITY: + return "VISIBILITY"; case NodeType::SIMULATION: return "SIMULATION"; @@ -159,7 +159,6 @@ eDepsSceneComponentType nodeTypeToSceneComponent(NodeType type) case NodeType::GENERIC_DATABLOCK: case NodeType::PARTICLE_SYSTEM: case NodeType::PARTICLE_SETTINGS: - case NodeType::SHADING_PARAMETERS: case NodeType::POINT_CACHE: case NodeType::IMAGE_ANIMATION: case NodeType::BATCH_CACHE: @@ -176,6 +175,10 @@ eDepsSceneComponentType nodeTypeToSceneComponent(NodeType type) case NodeType::PROXY: case NodeType::SIMULATION: return DEG_SCENE_COMP_PARAMETERS; + + case NodeType::VISIBILITY: + BLI_assert_msg(0, "Visibility component is supposed to be only used internally."); + return DEG_SCENE_COMP_PARAMETERS; } BLI_assert_msg(0, "Unhandled node type, not supposed to happen."); return DEG_SCENE_COMP_PARAMETERS; @@ -242,7 +245,6 @@ eDepsObjectComponentType nodeTypeToObjectComponent(NodeType type) case NodeType::GENERIC_DATABLOCK: case NodeType::PARTICLE_SYSTEM: case NodeType::PARTICLE_SETTINGS: - case NodeType::SHADING_PARAMETERS: case NodeType::POINT_CACHE: case NodeType::IMAGE_ANIMATION: case NodeType::BATCH_CACHE: @@ -252,6 +254,10 @@ eDepsObjectComponentType nodeTypeToObjectComponent(NodeType type) case NodeType::UNDEFINED: case NodeType::NUM_TYPES: return DEG_OB_COMP_PARAMETERS; + + case NodeType::VISIBILITY: + BLI_assert_msg(0, "Visibility component is supposed to be only used internally."); + return DEG_OB_COMP_PARAMETERS; } BLI_assert_msg(0, "Unhandled node type, not suppsed to happen."); return DEG_OB_COMP_PARAMETERS; @@ -305,7 +311,6 @@ Node::~Node() } } -/* Generic identifier for Depsgraph Nodes. */ string Node::identifier() const { return string(nodeTypeAsString(type)) + " : " + name; |