Added warning message on attempt to join 2 Meshes with vertex keys.

That feature is not available... and I doubt that'll be soon. :)

1 files changed, 9 insertions, 1 deletions

diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 6ff6eb76829..c843be44943 100644
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -7023,7 +7023,7 @@ void join_mesh(void)
 	float imat[4][4], cmat[4][4];
 	int a, b, totcol, totvert=0, totface=0, ok=0, vertofs, map[MAXMAT];
 #ifdef __NLA
-	int	i, j, index;
+	int	i, j, index, haskey=0;
 	bDeformGroup *dg, *odg;
 	MDeformVert *dvert, *dvertmain;
 #endif
@@ -7044,11 +7044,19 @@ void join_mesh(void)
 				totface+= me->totface;
 				
 				if(base->object == ob) ok= 1;
+				if(me->key) {
+					haskey= 1;
+					break;
+				}
 			}
 		}
 		base= base->next;
 	}
 	
+	if(haskey) {
+		error("Join with vertex keys not supported");
+		return;
+	}
 	/* that way the active object is always selected */ 
 	if(ok==0) return;