From d5b9ae57ca1b76ae1a2c296e83cc91029d373cea Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Aug 2012 19:28:22 +0000 Subject: Switching images in the image space would modify UV coordinates. This is an intended feature but works too unreliably. - This setting was stored in each face and only editable by re-running the unwrap, this is too hidden (only discovered this by reading code). - This worked with blender internal but not with cycles, such basic options as changing an image shouldn't behave different depending on the render engine selected. I've ifdef'd out the aspect correction for now, it could be added back as a per scene option and be made to run on both cycles or blender internal but for now I prefer to keep this disabled. --- source/blender/makesdna/DNA_meshdata_types.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/makesdna/DNA_meshdata_types.h') diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 9ae2bec583d..2f5ef9c2aaa 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -95,7 +95,7 @@ typedef struct MLoop { typedef struct MTexPoly { struct Image *tpage; char flag, transp; - short mode, tile, unwrap; + short mode, tile, pad; } MTexPoly; /* can copy from/to MTexPoly/MTFace */ @@ -106,8 +106,7 @@ typedef struct MTexPoly { (dst)->transp = (src)->transp; \ (dst)->mode = (src)->mode; \ (dst)->tile = (src)->tile; \ - (dst)->unwrap = (src)->unwrap; \ -} +} (void)0 typedef struct MLoopUV { float uv[2]; @@ -368,6 +367,5 @@ typedef struct MVertSkin { #define TF_PIN2 32 #define TF_PIN3 64 #define TF_PIN4 128 -#define TF_CORRECT_ASPECT 256 #endif -- cgit v1.2.3