[Bf-blender-cvs] [267f0e521ee] hair_guides: New OB_GROOM type for hair editing objects.

[Lukas Tönne]

Commit: 267f0e521ee1d61c9655970555be8e10db765981
Author: Lukas Tönne
Date:   Thu Dec 7 08:37:35 2017 +0000
Branches: hair_guides
https://developer.blender.org/rB267f0e521ee1d61c9655970555be8e10db765981

New OB_GROOM type for hair editing objects.

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

M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/intern/context.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/editors/object/object_edit.c
M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 0bce2a6317c..d2ef2f071ed 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -112,6 +112,7 @@ enum {
 	CTX_MODE_EDIT_ARMATURE,
 	CTX_MODE_EDIT_METABALL,
 	CTX_MODE_EDIT_LATTICE,
+	CTX_MODE_EDIT_GROOM,
 	CTX_MODE_POSE,
 	CTX_MODE_SCULPT,
 	CTX_MODE_PAINT_WEIGHT,
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index b9fef2993b6..5b708f053b2 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1013,6 +1013,8 @@ int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob)
 				return CTX_MODE_EDIT_METABALL;
 			case OB_LATTICE:
 				return CTX_MODE_EDIT_LATTICE;
+			case OB_GROOM:
+				return CTX_MODE_EDIT_GROOM;
 		}
 	}
 	else {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8fa4ebb8b3c..cc23e090b05 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -585,6 +585,7 @@ static const char *get_obdata_defname(int type)
 		case OB_SURF: return DATA_("Surf");
 		case OB_FONT: return DATA_("Text");
 		case OB_MBALL: return DATA_("Mball");
+		case OB_GROOM: return DATA_("Groom");
 		case OB_CAMERA: return DATA_("Camera");
 		case OB_LAMP: return DATA_("Lamp");
 		case OB_LATTICE: return DATA_("Lattice");
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index a2a0f633fd9..16f83773f70 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -533,6 +533,7 @@ void DepsgraphNodeBuilder::build_object_data(Object *object)
 		case OB_FONT:
 		case OB_SURF:
 		case OB_MBALL:
+		case OB_GROOM:
 		case OB_LATTICE:
 			build_obdata_geom(object);
 			/* TODO(sergey): Only for until we support granular
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f2805cc9a7c..bb3638fac5e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -565,6 +565,7 @@ void DepsgraphRelationBuilder::build_object_data(Object *object)
 		case OB_FONT:
 		case OB_SURF:
 		case OB_MBALL:
+		case OB_GROOM:
 		case OB_LATTICE:
 		{
 			build_obdata_geom(object);
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index faaf3a828b2..68c201d4e77 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -166,6 +166,7 @@ void id_tag_update_object_data(Depsgraph *graph, IDDepsNode *id_node)
 				case OB_SURF:
 				case OB_FONT:
 				case OB_MBALL:
+				case OB_GROOM:
 					data_comp = id_node->find_component(DEG_NODE_TYPE_GEOMETRY);
 					break;
 				case OB_ARMATURE:
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 804d0ed1f0d..9fd690f6e44 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1490,6 +1490,7 @@ static bool object_mode_compat_test(Object *ob, eObjectMode mode)
 			case OB_SURF:
 			case OB_FONT:
 			case OB_MBALL:
+			case OB_GROOM:
 				if (mode & (OB_MODE_EDIT))
 					return true;
 				break;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 6187a46dcd7..78c89dfcdd1 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -386,6 +386,7 @@ enum {
 	OB_SURF       = 3,
 	OB_FONT       = 4,
 	OB_MBALL      = 5,
+	OB_GROOM      = 6,
 
 	OB_LAMP       = 10,
 	OB_CAMERA     = 11,