[Bf-blender-cvs] [d70547b666c] hair_guides: In object mode just draw simple wires for groom objects for now.

Lukas Tönne noreply at git.blender.org
Fri Dec 22 12:17:59 CET 2017


Commit: d70547b666ca9c4ba3ee7f163db2bbeeb32b64b3
Author: Lukas Tönne
Date:   Fri Dec 22 11:17:33 2017 +0000
Branches: hair_guides
https://developer.blender.org/rBd70547b666ca9c4ba3ee7f163db2bbeeb32b64b3

In object mode just draw simple wires for groom objects for now.

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

M	source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index dfeed0a97a0..6f69a92f70f 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1867,6 +1867,19 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 			}
 			break;
 		}
+		case OB_GROOM:
+		{
+			Object *obedit = scene->obedit;
+			if (ob != obedit) {
+				struct Gwn_Batch *geom = DRW_cache_groom_wire_get(ob);
+				if (theme_id == TH_UNDEFINED) {
+					theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
+				}
+				DRWShadingGroup *shgroup = shgroup_theme_id_to_wire_or(stl, theme_id, stl->g_data->wire);
+				DRW_shgroup_call_add(shgroup, geom, ob->obmat);
+			}
+			break;
+		}
 		case OB_LAMP:
 			DRW_shgroup_lamp(stl, ob, view_layer);
 			break;



More information about the Bf-blender-cvs mailing list