[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42318] trunk/blender/source/blender: Fixed crash caused by recent VBO's changes

[Sergey Sharybin]

Revision: 42318
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42318
Author:   nazgul
Date:     2011-12-01 18:26:48 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Fixed crash caused by recent VBO's changes

Crash was caused by non-initialized original index passing to compareDrawOptions
callback. Due to in some cases it's enough to know indices of faces in final DM
(like for comparing if the same texture used for mesh drawing) assume this
callback receives index in final DM and if it's needed it will make conversion
to original index itself.

This should help reaching extra speed if textured object is affected by
bevel modifiers, i.e.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/editors/space_view3d/drawmesh.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-12-01 17:51:19 UTC (rev 42317)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-12-01 18:26:48 UTC (rev 42318)
@@ -804,15 +804,9 @@
 				flush= !flag || i == tottri - 1;
 
 				if(!flush && compareDrawOptions) {
-					int next_orig= (index==NULL) ? next_actualFace : index[next_actualFace];
-
-					if(orig==ORIGINDEX_NONE || next_orig==ORIGINDEX_NONE) {
-						flush= 1;
-					} else {
-						/* also compare draw options and flush buffer if they're different
-						   need for face selection highlight in edit mode */
-						flush|= compareDrawOptions(userData, orig, next_orig) == 0;
-					}
+					/* also compare draw options and flush buffer if they're different
+					   need for face selection highlight in edit mode */
+					flush|= compareDrawOptions(userData, actualFace, next_actualFace) == 0;
 				}
 
 				if(flush) {
@@ -990,15 +984,7 @@
 					flush|= mf[actualFace].mat_nr != mf[next_actualFace].mat_nr;
 
 					if(!flush && compareDrawOptions) {
-						int next_orig= (index==NULL) ? next_actualFace : index[next_actualFace];
-
-						if(orig==ORIGINDEX_NONE || next_orig==ORIGINDEX_NONE) {
-							flush= 1;
-						} else {
-							/* also compare draw options and flush buffer if they're different
-							   need for face selection highlight in edit mode */
-							flush|= compareDrawOptions(userData, orig, next_orig) == 0;
-						}
+						flush|= compareDrawOptions(userData, actualFace, next_actualFace) == 0;
 					}
 
 					if(flush) {

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2011-12-01 17:51:19 UTC (rev 42317)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2011-12-01 18:26:48 UTC (rev 42318)
@@ -631,14 +631,14 @@
 
 static int compareDrawOptions(void *userData, int cur_index, int next_index)
 {
-	Mesh *me= (Mesh*) userData;
-	MFace *mf= CustomData_get_layer(&me->fdata, CD_MFACE);
-	MTFace *tf= CustomData_get_layer(&me->fdata, CD_MTFACE);
+	DerivedMesh *dm= (DerivedMesh*) userData;
+	MFace *mf = DM_get_face_data_layer(dm, CD_MFACE);
+	MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE);
 
-	if(mf[cur_index].mat_nr != mf[next_index].mat_nr)
+	if(mf && mf[cur_index].mat_nr != mf[next_index].mat_nr)
 		return 0;
 
-	if(tf[cur_index].tpage != tf[next_index].tpage)
+	if(tf && tf[cur_index].tpage != tf[next_index].tpage)
 		return 0;
 
 	return 1;
@@ -683,7 +683,7 @@
 			if(!CustomData_has_layer(&dm->faceData,CD_TEXTURE_MCOL))
 				add_tface_color_layer(dm);
 
-			dm->drawFacesTex(dm, draw_tface__set_draw, compareDrawOptions, ob->data);
+			dm->drawFacesTex(dm, draw_tface__set_draw, compareDrawOptions, dm);
 		}
 	}
 

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-12-01 17:51:19 UTC (rev 42317)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-12-01 18:26:48 UTC (rev 42318)
@@ -2323,7 +2323,7 @@
 	 * return 2 for the active face so it renders with stipple enabled */
 static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
-	struct { unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
+	struct { DerivedMesh *dm; unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
 	EditFace *efa = EM_get_face_for_index(index);
 	unsigned char *col;
 	
@@ -2343,11 +2343,18 @@
 
 static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int next_index)
 {
-	struct { unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
-	EditFace *efa = EM_get_face_for_index(index);
-	EditFace *next_efa = EM_get_face_for_index(next_index);
+	struct { DerivedMesh *dm; unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
+	int *orig_index= DM_get_face_data_layer(data->dm, CD_ORIGINDEX);
+	EditFace *efa;
+	EditFace *next_efa;
 	unsigned char *col, *next_col;
 
+	if(!orig_index)
+		return 0;
+
+	efa= EM_get_face_for_index(orig_index[index]);
+	next_efa= EM_get_face_for_index(orig_index[next_index]);
+
 	if(efa == next_efa)
 		return 1;
 
@@ -2366,7 +2373,8 @@
 /* also draws the active face */
 static void draw_dm_faces_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol, unsigned char *actCol, EditFace *efa_act) 
 {
-	struct { unsigned char *cols[3]; EditFace *efa_act; } data;
+	struct { DerivedMesh *dm; unsigned char *cols[3]; EditFace *efa_act; } data;
+	data.dm= dm;
 	data.cols[0] = baseCol;
 	data.cols[1] = selCol;
 	data.cols[2] = actCol;