diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-24 16:14:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-24 16:38:15 +0300 |
| commit | 7a9ad029dd1d1afe42d54c9c181de887636db7c0 (patch) | |
| tree | e9281cbe8bb01365a699ffd6f4bbd09a6a91015f /source/blender/blenkernel/intern/customdata.c | |
| parent | 707340edd703ff1fd7c8157eb3cc811913698c8d (diff) | |
Remove TexFace, per-face images
TexFace complicates the now more popular shading pipeline by having
per-face images, see: T51382 for details.
To keep the ability to select a per-material edit-image
(used with UV-mapping workflow), the material now stores an image
which will be set when changing images in edit-mode.
This is used as a bake-target when not using Cycles too.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 7c3f0ac630d..96b15a22554 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -419,7 +419,7 @@ static void layerSwap_tface(void *data, const int *corner_indices) static void layerDefault_tface(void *data, int count) { - static MTFace default_tf = {{{0, 0}, {1, 0}, {1, 1}, {0, 1}}, NULL, + static MTFace default_tf = {{{0, 0}, {1, 0}, {1, 1}, {0, 1}}, 0, 0, TF_DYNAMIC | TF_CONVERTED, 0, 0}; MTFace *tf = (MTFace *)data; int i; |