[Bf-blender-cvs] [b4b1397ad93] master: Depsgraph: Don't cast ID_Type to short

Sergey Sharybin noreply at git.blender.org
Mon Aug 28 11:43:51 CEST 2017


Commit: b4b1397ad9314b73ad58daaf70206b3e3f30c063
Author: Sergey Sharybin
Date:   Mon Aug 28 11:43:36 2017 +0200
Branches: master
https://developer.blender.org/rBb4b1397ad9314b73ad58daaf70206b3e3f30c063

Depsgraph: Don't cast ID_Type to short

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

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

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 89d09d3cec1..d70d8116178 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -960,7 +960,7 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
 	LINKLIST_FOREACH (bNode *, bnode, &ntree->nodes) {
 		ID *id = bnode->id;
 		if (id != NULL) {
-			short id_type = GS(id->name);
+			ID_Type id_type = GS(id->name);
 			if (id_type == ID_MA) {
 				build_material((Material *)id);
 			}
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index b30110732a2..f73bb65e5dc 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -109,7 +109,7 @@ void lib_id_recalc_tag_flag(Main *bmain, ID *id, int flag)
 		 * nodes for update after relations update and after layer
 		 * visibility changes.
 		 */
-		short idtype = GS(id->name);
+		ID_Type idtype = GS(id->name);
 		if (idtype == ID_OB) {
 			Object *object = (Object *)id;
 			object->recalc |= (flag & OB_RECALC_ALL);



More information about the Bf-blender-cvs mailing list