archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Made WeightPaint use shaded mode. This thanks to the preparations as done

Browse Source 
by daniel before. :)
Note; the shaded display uses smooth normals by default, because thats how
the derived mesh works!

Daniel; I've changed the G_WEIGHTPAINT hack in derivedmesh code... no idea
how this could work even. Still ugly though.
This commit is contained in:
Ton Roosendaal
2005-09-24 13:49:55 +00:00
parent ac4dde3477
commit e1c56fc201
5 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/src/drawobject.c
View File

@@ -1636,6 +1636,12 @@ static void draw_mesh_object_outline(Object *ob, DerivedMesh *dm)
}
}
static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r)
{
*drawSmooth_r = 1;
return 1;
}
static void draw_mesh_fancy(Object *ob, DerivedMesh *baseDM, DerivedMesh *dm, int dt)
{
Mesh *me = ob->data;
@@ -1693,7 +1699,13 @@ static void draw_mesh_fancy(Object *ob, DerivedMesh *baseDM, DerivedMesh *dm, in
}
else if(dt==OB_SHADED) {
if( (G.f & G_WEIGHTPAINT)) {
dm->drawMappedFaces(dm, NULL, NULL, 1);
glEnable(GL_LIGHTING);
glEnable(GL_COLOR_MATERIAL);
set_gl_material(0); // defmaterial settings
dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1);
glDisable(GL_LIGHTING);
glDisable(GL_COLOR_MATERIAL);
}
else if((G.f & (G_VERTEXPAINT+G_TEXTUREPAINT)) && me->mcol) {
dm->drawMappedFaces(dm, NULL, NULL, 1);