- switch several instances of makeDispList to use more specific version

4 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 79862220062..6f2ddc8c783 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -852,14 +852,14 @@ static void build_mesh_data(Object *ob, int inEditMode)
 				ob->hooks.first ||
 				(ob->softflag & OB_SB_ENABLE) ||
 				(ob->effect.first && ((Effect*) ob->effect.first)->type==EFF_WAVE))
-			makeDispList(ob);
+			makeDispListMesh(ob);
 	}
 
 	if ((me->flag&ME_SUBSURF) && me->subdiv) {
 		if(inEditMode && !G.editMesh->derived) {
-			makeDispList(ob);
+			makeDispListMesh(ob);
 		} else if (!inEditMode && !me->derived) {
-			makeDispList(ob);
+			makeDispListMesh(ob);
 		}
 	}
 
diff --git a/source/blender/python/api2_2x/Curve.c b/source/blender/python/api2_2x/Curve.c
index f427f91c45d..25394c0e543 100644
--- a/source/blender/python/api2_2x/Curve.c
+++ b/source/blender/python/api2_2x/Curve.c
@@ -1632,7 +1632,7 @@ void update_displists( void *data )
 			if( ELEM( ob->type, OB_CURVE, OB_SURF ) ) {
 				if( ob != G.obedit ) {
 					if( ob->data == data ) {
-						makeDispList( ob );
+						makeDispListCurveTypes( ob );
 					}
 				}
 			} else if( ob->type == OB_FONT ) {
@@ -1641,7 +1641,7 @@ void update_displists( void *data )
 					if( ( ( Curve * ) cu->textoncurve->
 					      data )->key ) {
 						text_to_curve( ob, 0 );
-						makeDispList( ob );
+						makeDispListCurveTypes( ob );
 					}
 				}
 			}
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index ff557f654d4..1458ab1b35b 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -615,7 +615,7 @@ void do_common_editbuts(unsigned short event) // old name, is a mix of object an
 							else nu->flag &= ~ME_SMOOTH;
 							nu= nu->next;
 						}
-						makeDispList(base->object);
+						makeDispListCurveTypes(base->object);
 					}
 				}
 				base= base->next;
@@ -910,7 +910,7 @@ void do_fontbuts(unsigned short event)
 			allqueue(REDRAWBUTSEDIT, 0);
 			allqueue(REDRAWVIEW3D, 0);
 			text_to_curve(ob, 0);
-			makeDispList(ob);
+			makeDispListCurveTypes(ob);
 		}
 		else {
 			error("Do you really need that many text frames?");
@@ -925,7 +925,7 @@ void do_fontbuts(unsigned short event)
 			allqueue(REDRAWBUTSEDIT, 0);
 			allqueue(REDRAWVIEW3D, 0);
 			text_to_curve(ob, 0);
-			makeDispList(ob);			
+			makeDispListCurveTypes(ob);			
 		}
 		break;
 	case B_TOUPPER:
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 03f730b5016..97a4a9d5f59 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -2336,7 +2336,7 @@ static void drawDispList(Object *ob, int dt)
 		cu= ob->data;
 		
 		lb= &cu->disp;
-		if(lb->first==0) makeDispList(ob);
+		if(lb->first==0) makeDispListCurveTypes(ob);
 		
 		if(solid) {
 			dl= lb->first;
@@ -2386,7 +2386,7 @@ static void drawDispList(Object *ob, int dt)
 	case OB_SURF:
 	
 		lb= &((Curve *)ob->data)->disp;
-		if(lb->first==0) makeDispList(ob);
+		if(lb->first==0) makeDispListCurveTypes(ob);
 		
 		if(solid) {
 			dl= lb->first;
@@ -2413,7 +2413,7 @@ static void drawDispList(Object *ob, int dt)
 		
 		if( is_basis_mball(ob)) {
 			lb= &ob->disp;
-			if(lb->first==0) makeDispList(ob);
+			if(lb->first==0) makeDispListMBall(ob);
 	
 			if(solid) {
 				
@@ -3297,14 +3297,14 @@ static void draw_bounding_volume(Object *ob)
 	else if ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT) {
 		bb= ( (Curve *)ob->data )->bb;
 		if(bb==0) {
-			makeDispList(ob);
+			makeDispListCurveTypes(ob);
 			bb= ( (Curve *)ob->data )->bb;
 		}
 	}
 	else if(ob->type==OB_MBALL) {
 		bb= ob->bb;
 		if(bb==0) {
-			makeDispList(ob);
+			makeDispListMBall(ob);
 			bb= ob->bb;
 		}
 	}