[Bf-blender-cvs] [3f4df3f847a] blender2.8: Fix missing hair in fishycat and everything else after particle recalc changes

Mai Lavelle noreply at git.blender.org
Wed Apr 4 11:11:21 CEST 2018


Commit: 3f4df3f847a948b9e9954d00311b0135008258f8
Author: Mai Lavelle
Date:   Sat Mar 31 02:19:52 2018 -0400
Branches: blender2.8
https://developer.blender.org/rB3f4df3f847a948b9e9954d00311b0135008258f8

Fix missing hair in fishycat and everything else after particle recalc changes

The cache was getting reset always, due to special case of flag being 0.

Bug introduced by: 44cd24a9cee9ffb14b5d26a622f

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

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

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

diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 8f2f6e258fb..b3796f56083 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -397,7 +397,7 @@ void deg_graph_id_tag_update(Main *bmain, Depsgraph *graph, ID *id, int flag)
 	DEG_id_type_tag(bmain, GS(id->name));
 	if (flag == 0) {
 		/* TODO(sergey): Which recalc flags to set here? */
-		id->recalc |= ID_RECALC_ALL;
+		id->recalc |= ID_RECALC_ALL & ~DEG_TAG_PSYS_ALL;
 		if (id_node != NULL) {
 			id_node->tag_update(graph);
 		}



More information about the Bf-blender-cvs mailing list