diff options
| author | Germano Cavalcante <mano-wii> | 2021-04-01 16:41:12 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-04-01 16:54:49 +0300 |
| commit | f674976edd884d7a9a409042708f2b1169fd4e98 (patch) | |
| tree | 1b2b293170e06d635aa6d3145db61bd4f6d4e535 /source/blender/blenkernel/intern/displist.c | |
| parent | 7a757662bc0a99b6f4720bb0e92735e54f9a1441 (diff) | |
Curve: Remove 'CU_2D' flag used for nurbs
This fixes T86440
As the CU_2D flag is set for nurbs, a Curve can have 2D nurbs mixed with 3D.
But the UI does not allow this mixing. It updates all nurbs to 2D or 3D when set.
So remove this specific flag for nurbs.
This may break old files, since 2D curves with mixed 3D are now set as 3D.
Differential Revision: https://developer.blender.org/D10738
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index a04bad45bf6..9022760fe34 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1185,7 +1185,7 @@ void BKE_displist_make_surf(Depsgraph *depsgraph, /* dl->rt will be used as flag for render face and */ /* CU_2D conflicts with R_NOPUNOFLIP */ - dl->rt = nu->flag & ~CU_2D; + dl->rt = nu->flag; data = dl->verts; if (nu->flagu & CU_NURB_CYCLIC) { @@ -1209,7 +1209,7 @@ void BKE_displist_make_surf(Depsgraph *depsgraph, /* dl->rt will be used as flag for render face and */ /* CU_2D conflicts with R_NOPUNOFLIP */ - dl->rt = nu->flag & ~CU_2D; + dl->rt = nu->flag; data = dl->verts; dl->type = DL_SURF; @@ -1320,7 +1320,7 @@ static void fillBevelCap(const Nurb *nu, /* dl->rt will be used as flag for render face and */ /* CU_2D conflicts with R_NOPUNOFLIP */ - dl->rt = nu->flag & ~CU_2D; + dl->rt = nu->flag; BLI_addtail(dispbase, dl); } @@ -1551,7 +1551,7 @@ static void do_makeDispListCurveTypes(Depsgraph *depsgraph, /* dl->rt will be used as flag for render face and */ /* CU_2D conflicts with R_NOPUNOFLIP */ - dl->rt = nu->flag & ~CU_2D; + dl->rt = nu->flag; int a = dl->nr; BevPoint *bevp = bl->bevpoints; @@ -1606,7 +1606,7 @@ static void do_makeDispListCurveTypes(Depsgraph *depsgraph, /* dl->rt will be used as flag for render face and */ /* CU_2D conflicts with R_NOPUNOFLIP */ - dl->rt = nu->flag & ~CU_2D; + dl->rt = nu->flag; /* for each point of poly make a bevel piece */ BevPoint *bevp_first = bl->bevpoints; |