diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-09-10 23:32:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-10 23:32:44 +0400 |
| commit | 0bd32f3ac60393fca5af17534c8ee90e20664cbd (patch) | |
| tree | 37593e75c494bd53a44f26b1797447edef9989e0 /source/blender/blenkernel | |
| parent | 1f0b07c37b4fc51955b8738d9f1922623d98b87c (diff) | |
Changes to "Face Select" mode
* Does not indicate that UV's exist, nor does it add UV's when used.
* Only accessible for texturepaint, vertexpaint and weightpaint from a button in the header (Paint Selection Mask)
* Not accessible from the mode menu, this is only an option that applies to paint modes.
This dosnt effect DNA, face select (G_FACESELECT) can be enabled at any time but is only used when paint modes are enabled.
Other changes
* UKey is uv unwrap in editmode, Ukey for undo was editmode only anyway.
* UVCalc in editmode adds a UV Layer if there is not one alredy.
* texture draw in editmode does not draw the face dots (they are get in the way of texturing)
* some missing updates were added.
* removed manipulator from when paint modes are enabled since the manipulator is not drawn in the 3d view.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index a1392bb0a98..153446caec5 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -176,6 +176,7 @@ typedef struct Global { #define G_DRAWSEAMS (1 << 20) #define G_HIDDENEDGES (1 << 21) + /* Measurement info Drawing */ #define G_DRAW_EDGELEN (1 << 22) #define G_DRAW_FACEAREA (1 << 23) @@ -193,6 +194,11 @@ typedef struct Global { #define G_AUTOMATKEYS (1 << 30) +/* macro for testing face select mode + * Texture paint could be removed since selected faces are not used + * however hiding faces is useful */ +#define FACESEL_PAINT_TEST ((G.f&G_FACESELECT) && (G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT))) + /* G.fileflags */ #define G_AUTOPACK (1 << 0) diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 25826037d5f..ab5a3a9a531 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1782,7 +1782,7 @@ CustomDataMask get_viewedit_datamask() ScrArea *sa; /* check if we need tfaces & mcols due to face select or texture paint */ - if(G.f & G_FACESELECT || G.f & G_TEXTUREPAINT) { + if(FACESEL_PAINT_TEST || G.f & G_TEXTUREPAINT) { mask |= CD_MASK_MTFACE | CD_MASK_MCOL; } else { /* check if we need tfaces & mcols due to view mode */ @@ -2325,7 +2325,7 @@ static void mesh_build_data(Object *ob, CustomDataMask dataMask) if(ob!=G.obedit) { Object *obact = G.scene->basact?G.scene->basact->object:NULL; - int editing = (G.f & (G_FACESELECT|G_WEIGHTPAINT|G_VERTEXPAINT|G_TEXTUREPAINT)); + int editing = (FACESEL_PAINT_TEST); int needMapping = editing && (ob==obact); if( (G.f & G_WEIGHTPAINT) && ob==obact ) { |