[Bf-blender-cvs] [36fac1e27cc] hair_guides: Merge branch 'blender2.8' into hair_guides

Lukas Tönne noreply at git.blender.org
Wed Jan 3 11:24:11 CET 2018


Commit: 36fac1e27ccc143a56bcf9ce35c236d5762e79fc
Author: Lukas Tönne
Date:   Wed Jan 3 10:24:05 2018 +0000
Branches: hair_guides
https://developer.blender.org/rB36fac1e27ccc143a56bcf9ce35c236d5762e79fc

Merge branch 'blender2.8' into hair_guides

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



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

diff --cc source/blender/depsgraph/intern/depsgraph_tag.cc
index dc8a4aecc46,2255e1ce1b9..9082c885c64
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@@ -168,13 -93,12 +93,13 @@@ void depsgraph_geometry_tag_to_componen
  				case OB_SURF:
  				case OB_FONT:
  				case OB_MBALL:
 +				case OB_GROOM:
- 					data_comp = id_node->find_component(DEG_NODE_TYPE_GEOMETRY);
+ 					*component_type = DEG_NODE_TYPE_GEOMETRY;
  					break;
  				case OB_ARMATURE:
- 					data_comp = id_node->find_component(DEG_NODE_TYPE_EVAL_POSE);
+ 					*component_type = DEG_NODE_TYPE_EVAL_POSE;
  					break;
- 				/* TODO(sergey): More cases here? */
+ 					/* TODO(sergey): More cases here? */
  			}
  			break;
  		}



More information about the Bf-blender-cvs mailing list