[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33870] trunk/blender/source/blender: 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 .

[Campbell Barton]

Revision: 33870
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33870
Author:   campbellbarton
Date:     2010-12-23 05:26:53 +0100 (Thu, 23 Dec 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-12-23 04:16:31 UTC (rev 33869)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-12-23 04:26:53 UTC (rev 33870)
@@ -2819,7 +2819,7 @@
 	/* 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 @@
 		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;
 	}
 	

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-12-23 04:16:31 UTC (rev 33869)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-12-23 04:26:53 UTC (rev 33870)
@@ -2481,7 +2481,7 @@
 	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 @@
 				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 @@
 			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 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 @@
 
 			EM_free_index_arrays();
 		}
-		else bbs_mesh_solid(scene, v3d, ob);
+		else bbs_mesh_solid(scene, ob);
 	}
 		break;
 	case OB_CURVE:

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-12-23 04:16:31 UTC (rev 33869)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-12-23 04:26:53 UTC (rev 33870)
@@ -2305,9 +2305,6 @@
 	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);

Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2010-12-23 04:16:31 UTC (rev 33869)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2010-12-23 04:26:53 UTC (rev 33870)
@@ -170,7 +170,7 @@
 	
 	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 @@
 	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;