diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-07-22 14:35:40 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-07-22 14:35:40 +0300 |
| commit | 679113fbd5ecef72850b572535534ffde1f03f11 (patch) | |
| tree | 38ab7d04759ddf86a999938504a0346dfdd9e51a /source/blender/editors/transform | |
| parent | 65d2374c806ecf42ccf106cd28380e7a7071f789 (diff) | |
Basic drawing code for hair edit mode in the new 2.8 draw engine system.
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index fc22f9c0088..0337b1a376c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2096,8 +2096,8 @@ static void StrandVertsToTransData(TransInfo *t, TransData *td, static void createTransStrandVerts(TransInfo *t) { - Scene *scene = t->scene; - Object *ob = OBACT; + SceneLayer *sl = t->scene_layer; + Object *ob = OBACT_NEW; BMEditStrands *edit = BKE_editstrands_from_object(ob); BMesh *bm = edit->base.bm; TransData *tob = NULL; @@ -2262,8 +2262,8 @@ cleanup: void flushTransStrands(TransInfo *t) { - Scene *scene = t->scene; - Object *ob = OBACT; + SceneLayer *sl = t->scene_layer; + Object *ob = OBACT_NEW; BMEditStrands *edit = BKE_editstrands_from_object(ob); BMEditStrandsLocations origlocs = t->custom.type.data; @@ -6697,9 +6697,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t) { /* do nothing */ } - else if ((t->scene->basact) && - (ob = t->scene->basact->object) && - (ob->mode & OB_MODE_HAIR_EDIT) && + else if ((ob->mode & OB_MODE_HAIR_EDIT) && BKE_editstrands_from_object(ob)) { /* do nothing */ |