[Bf-blender-cvs] [3714c83441a] blender2.8: Depsgraph: Handle text datablock in ID builder

Sergey Sharybin noreply at git.blender.org
Wed Sep 19 16:10:18 CEST 2018


Commit: 3714c83441ab2c60f76fd8237303e007a62d0148
Author: Sergey Sharybin
Date:   Wed Sep 19 10:30:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3714c83441ab2c60f76fd8237303e007a62d0148

Depsgraph: Handle text datablock in ID builder

Just silence the assert/print, we do not add text data blocks
to dependency graph.

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 5a753d150d0..243039fafba 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -469,6 +469,9 @@ void DepsgraphNodeBuilder::build_id(ID *id)
 		case ID_SPK:
 			build_speaker((Speaker *)id);
 			break;
+		case ID_TXT:
+			/* Not a part of dependency graph. */
+			break;
 		default:
 			fprintf(stderr, "Unhandled ID %s\n", id->name);
 			BLI_assert(!"Should never happen");
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 51ea286d218..bdbac826544 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -450,6 +450,9 @@ void DepsgraphRelationBuilder::build_id(ID *id)
 		case ID_SPK:
 			build_speaker((Speaker *)id);
 			break;
+		case ID_TXT:
+			/* Not a part of dependency graph. */
+			break;
 		default:
 			fprintf(stderr, "Unhandled ID %s\n", id->name);
 			BLI_assert(!"Should never happen");



More information about the Bf-blender-cvs mailing list