Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2006-03-11 19:13:10 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2006-03-11 19:13:10 +0300
commit7d5be54fec482cedb93499f9c156aaf03fa407d6 (patch)
tree4e04e3aa5ddc3855c1e082fef3429a2c23056fc7 /source/blender/blenkernel/BKE_DerivedMesh.h
parent5f550b4ceb0d4888ac4be914b4051c02b9c8d375 (diff)
Fix for bug #3802: Display problems with modifiers and uv face select
The bug reported here was already fixed some weeks ago, but there were more issues. Modifier display in face select and paint modes was never properly finished. This fixes some small drawing update glitches, and only allows modifiers that preserve a mapping to the original mesh to be applied. Otherwise selection and painting isn't even possible.
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
-rw-r--r--source/blender/blenkernel/BKE_DerivedMesh.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 1b594e6d492..8b2882ca4e6 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -46,6 +46,7 @@
*/
struct MVert;
+struct TFace;
struct Object;
struct EditMesh;
struct DispListMesh;
@@ -140,10 +141,10 @@ struct DerivedMesh {
*/
void (*drawFacesColored)(DerivedMesh *dm, int useTwoSided, unsigned char *col1, unsigned char *col2);
- /* Draw all faces uses TFace
+ /* Draw all faces using TFace
* o Drawing options too complicated to enumerate, look at code.
*/
- void (*drawMappedFacesTex)(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int matnr), void *userData);
+ void (*drawFacesTex)(DerivedMesh *dm, int (*setDrawOptions)(struct TFace *tface, int matnr));
/* Draw mapped faces (no color, or texture)
* o Only if !setDrawOptions or setDrawOptions(userData, mapped-face-index, drawSmooth_r) returns true
@@ -157,6 +158,11 @@ struct DerivedMesh {
*/
void (*drawMappedFaces)(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors);
+ /* Draw mapped faces using TFace
+ * o Drawing options too complicated to enumerate, look at code.
+ */
+ void (*drawMappedFacesTex)(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index), void *userData);
+
/* Draw mapped edges as lines
* o Only if !setDrawOptions or setDrawOptions(userData, mapped-edge) returns true
*/