[Bf-blender-cvs] [c597a1b] soc-2014-shapekey: Fix compilation after merge.

[Bastien Montagne]

Commit: c597a1bb7520d704f44f3b2d6f7d7192e7a6e10b
Author: Bastien Montagne
Date:   Sun Aug 10 17:01:35 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rBc597a1bb7520d704f44f3b2d6f7d7192e7a6e10b

Fix compilation after merge.

===================================================================

M	source/blender/blenkernel/intern/scene.c
M	source/blender/collada/collada_utils.cpp
M	source/blender/editors/mesh/editmesh_tools.c

===================================================================

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index a6e23ed..1f9db34 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1600,7 +1600,7 @@ static void prepare_mesh_for_viewport_render(Main *bmain, Scene *scene)
 		{
 			if (check_rendered_viewport_visible(bmain)) {
 				BMesh *bm = mesh->edit_btmesh->bm;
-				BM_mesh_bm_to_me(bm, mesh, false);
+				BM_mesh_bm_to_me(bm, mesh, false, true);
 				DAG_id_tag_update(&mesh->id, 0);
 			}
 		}
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index d91689f..d17d9d0 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -362,6 +362,6 @@ void bc_triangulate_mesh(Mesh *me)
 	BM_mesh_bm_from_me(bm, me, true, false, 0);
 	BM_mesh_triangulate(bm, quad_method, use_beauty, tag_only, NULL, NULL);
 
-	BM_mesh_bm_to_me(bm, me, false);
+	BM_mesh_bm_to_me(bm, me, false, true);
 	BM_mesh_free(bm);
 }
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index ddf7650..13f30fa 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2417,6 +2417,7 @@ static void edbm_bfs_draw_info(bContext *C, ARegion *ar, void *customdata)
 }
 
 
+#if 0  /* Unused */
 static uiBlock *edbm_bfs_create_shapeselector(bContext *C, ARegion *ar, void *arg_op)
 {
 	uiBlock *block;
@@ -2428,7 +2429,9 @@ static uiBlock *edbm_bfs_create_shapeselector(bContext *C, ARegion *ar, void *ar
 
 	layout = uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 15 * UI_UNIT_X, UI_UNIT_Y, 0, UI_GetStyle());
 
+	return block;
 }
+#endif
 
 static int edbm_bfs_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {