branches/2-44-stable

Merge from trunk:
	revision 11967
	revision 11982
	revision 11986

source/blender/blenkernel/intern/action.c

@@ -1069,10 +1069,10 @@ static void do_nla(Object *ob, int blocktype)
 		}
 	}
 	if(strip==NULL) {	/* extend */
-		if(stripfirst)
-			scene_cfra= stripfirst->start;
-		else if(striplast)
+		if(striplast)
 			scene_cfra= striplast->end;
+		else if(stripfirst)
+			scene_cfra= stripfirst->start;
 	}
 	
 	/* and now go over all strips */

source/blender/blenkernel/intern/modifier.c

@@ -2453,7 +2453,42 @@ static void split_sharp_edges(SmoothMesh *mesh, float split_angle, int flags)
 
 }
 
-static void split_single_verts(SmoothMesh *mesh)
+static int count_bridge_verts(SmoothMesh *mesh)
+{
+	int i, j, count = 0;
+
+	for(i = 0; i < mesh->num_faces; i++) {
+		SmoothFace *face = &mesh->faces[i];
+
+		for(j = 0; j < SMOOTHFACE_MAX_EDGES && face->edges[j]; j++) {
+			SmoothEdge *edge = face->edges[j];
+			SmoothEdge *next_edge;
+			SmoothVert *vert = edge->verts[1 - face->flip[j]];
+			int next = (j + 1) % SMOOTHFACE_MAX_EDGES;
+
+			/* wrap next around if at last edge */
+			if(!face->edges[next]) next = 0;
+
+			next_edge = face->edges[next];
+
+			/* if there are other faces sharing this vertex but not
+			 * these edges, the vertex will be split, so count it
+			 */
+			/* vert has to have at least one face (this one), so faces != 0 */
+			if(!edge->faces->next && !next_edge->faces->next
+			    && vert->faces->next) {
+				count++;
+			}
+		}
+	}
+
+	/* each bridge vert will be counted once per face that uses it,
+	 * so count is too high, but it's ok for now
+	 */
+	return count;
+}
+
+static void split_bridge_verts(SmoothMesh *mesh)
 {
 	int i,j;
 
@@ -2501,6 +2536,7 @@ static DerivedMesh *edgesplitModifier_do(EdgeSplitModifierData *emd,
 	/* 2. count max number of elements to add */
 	tag_and_count_extra_edges(mesh, emd->split_angle, emd->flags, &max_edges);
 	max_verts = max_edges * 2 + mesh->max_verts;
+	max_verts += count_bridge_verts(mesh);
 	max_edges += mesh->max_edges;
 
 	/* 3. reallocate smoothmesh arrays & copy elements across */
@@ -2518,9 +2554,8 @@ static DerivedMesh *edgesplitModifier_do(EdgeSplitModifierData *emd,
 	printf("********** Post-edge-split **********\n");
 	smoothmesh_print(mesh);
 #endif
-#if 1
-	split_single_verts(mesh);
-#endif
+
+	split_bridge_verts(mesh);
 
 #ifdef EDGESPLIT_DEBUG_1
 	printf("********** Post-vert-split **********\n");

source/blender/python/api2_2x/doc/Key.py

@@ -113,9 +113,12 @@ class KeyBlock:
 			 
 		
 		A word on relative shape keys; relative shape keys are not actually
-		stored as offsets to the base shape key (like you'd expect).  Instead, 
-		the additive relative offset is calculated on the fly by comparing a 
-		shape key with its base key, which is always the very first shapekey 
-		in the keyblock list.
+		stored as offsets to the base shape key (like you'd expect).  Instead,
+		each shape key stores an entire model (actually the state of the mesh 
+		vertices after exiting editmode with any given key active).
+		 
+		The additive offset for a shape key is calculated (when needed) by 
+		comparing the shape key with its base key, which is always the very 
+		first in the keyblock list.
 		"""