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

remove View3D.customdata_mask, since its stored in the scene now there is no need for each view to store every views combine data mask.

Browse Source
This commit is contained in:
Campbell Barton
2010-12-23 04:26:53 +00:00
parent c046ae14be
commit b4f61f0733
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/sculpt_paint/paint_image.c
View File

@@ -2819,7 +2819,7 @@ static void project_paint_begin(ProjPaintState *ps)
/* Workaround for subsurf selection, try the display mesh first */
if (ps->source==PROJ_SRC_IMAGE_CAM) {
/* using render mesh, assume only camera was rendered from */
ps->dm = mesh_create_derived_render(ps->scene, ps->ob, ps->v3d->customdata_mask | CD_MASK_MTFACE);
ps->dm = mesh_create_derived_render(ps->scene, ps->ob, ps->scene->customdata_mask | CD_MASK_MTFACE);
ps->dm_release= TRUE;
}
else if(ps->ob->derivedFinal && CustomData_has_layer( &ps->ob->derivedFinal->faceData, CD_MTFACE)) {
@@ -2827,7 +2827,7 @@ static void project_paint_begin(ProjPaintState *ps)
ps->dm_release= FALSE;
}
else {
ps->dm = mesh_get_derived_final(ps->scene, ps->ob, ps->v3d->customdata_mask | CD_MASK_MTFACE);
ps->dm = mesh_get_derived_final(ps->scene, ps->ob, ps->scene->customdata_mask | CD_MASK_MTFACE);
ps->dm_release= TRUE;
}

12
source/blender/editors/space_view3d/drawobject.c
View File

@@ -2481,7 +2481,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
int draw_wire = 0;
int totvert, totedge, totface;
DispList *dl;
DerivedMesh *dm= mesh_get_derived_final(scene, ob, v3d->customdata_mask);
DerivedMesh *dm= mesh_get_derived_final(scene, ob, scene->customdata_mask);
if(!dm)
return;
@@ -2656,7 +2656,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
dm->release(dm);
shadeDispList(scene, base);
dl = find_displist(&ob->disp, DL_VERTCOL);
dm= mesh_get_derived_final(scene, ob, v3d->customdata_mask);
dm= mesh_get_derived_final(scene, ob, scene->customdata_mask);
}
if ((v3d->flag&V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && (base->flag&SELECT) && !draw_wire) {
@@ -2765,7 +2765,7 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
finalDM = cageDM = editmesh_get_derived_base(ob, em);
else
cageDM = editmesh_get_derived_cage_and_final(scene, ob, em, &finalDM,
v3d->customdata_mask);
scene->customdata_mask);
if(dt>OB_WIRE) {
// no transp in editmode, the fancy draw over goes bad then
@@ -6440,9 +6440,9 @@ static int bbs_mesh_solid_hide__setDrawOpts(void *userData, int index, int *UNUS
}
}
static void bbs_mesh_solid(Scene *scene, View3D *v3d, Object *ob)
static void bbs_mesh_solid(Scene *scene, Object *ob)
{
DerivedMesh *dm = mesh_get_derived_final(scene, ob, v3d->customdata_mask);
DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
Mesh *me = (Mesh*)ob->data;
glColor3ub(0, 0, 0);
@@ -6498,7 +6498,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
EM_free_index_arrays();
}
else bbs_mesh_solid(scene, v3d, ob);
else bbs_mesh_solid(scene, ob);
}
break;
case OB_CURVE:

3
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -2305,9 +2305,6 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
unsigned int lay_used;
const char *grid_unit= NULL;
/* from now on all object derived meshes check this */
v3d->customdata_mask= scene->customdata_mask;
/* shadow buffers, before we setup matrices */
if(draw_glsl_material(scene, NULL, v3d, v3d->drawtype))
gpu_update_lamps_shadows(scene, v3d);

5
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -170,7 +170,7 @@ typedef struct View3D {
float lens, grid;
float gridview; /* XXX deprecated, now in RegionView3D */
float padf, near, far;
float near, far;
float ofs[3]; /* XXX deprecated */
float cursor[3];
@@ -184,9 +184,6 @@ typedef struct View3D {
short twtype, twmode, twflag;
short twdrawflag; /* XXX deprecated */
/* customdata flags from modes */
unsigned int customdata_mask;
/* afterdraw, for xray & transparent */
struct ListBase afterdraw_transp;
struct ListBase afterdraw_xray;