[Bf-blender-cvs] [0d0f4c16340] hair_guides_grooming: Fix depsgraph cases for Groom, now uses ID type instead of object type.

[Lukas Tönne]

Commit: 0d0f4c163406e255cb53ecf68edf409cbb0db360
Author: Lukas Tönne
Date:   Sat Jun 9 07:04:35 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB0d0f4c163406e255cb53ecf68edf409cbb0db360

Fix depsgraph cases for Groom, now uses ID type instead of object type.

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

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 b2a7beb3632..8fd41327793 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1171,8 +1171,7 @@ void 
DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata)
                        op_node->set_as_entry();
                        break;
                }
-
-               case OB_GROOM:
+               case ID_GM:
                {
                        /* Groom evaluation operations. */
                        op_node = add_operation_node(obdata, 
DEG_NODE_TYPE_GEOMETRY,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc 
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 0b5a50d6627..eb0a563c843 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1908,12 +1908,7 @@ void 
DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata)
                }
                case ID_LT:
                        break;
-               default:
-                       BLI_assert(!"Should not happen");
-                       break;
-               }
-
-               case OB_GROOM: /* Groom */
+               case ID_GM: /* Groom */
                {
                        Groom *groom = (Groom *)obdata;
                        ComponentKey geometry_key(&groom->id, 
DEG_NODE_TYPE_GEOMETRY);
@@ -1924,6 +1919,10 @@ void 
DepsgraphRelationBuilder::build_object_data_geometry_datablock(ID *obdata)
                                add_relation(ComponentKey(scalp_id, 
DEG_NODE_TYPE_GEOMETRY), geometry_key, "Scalp Object -> Groom");
                        }
                        break;
+               }
+               default:
+                       BLI_assert(!"Should not happen");
+                       break;
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs