[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58084] trunk/blender: Fix #35969: blender internal and cycles not updating mesh while in edit mode.

[Brecht Van Lommel]

Revision: 58084
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58084
Author:   blendix
Date:     2013-07-08 22:41:14 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Fix #35969: blender internal and cycles not updating mesh while in edit mode.
Patch for blender internal made by Campbell.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_mesh.cpp
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-07-08 22:41:12 UTC (rev 58083)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2013-07-08 22:41:14 UTC (rev 58084)
@@ -462,6 +462,9 @@
 	mesh->name = ustring(b_ob_data.name().c_str());
 
 	if(render_layer.use_surfaces || render_layer.use_hair) {
+		if(preview)
+			b_ob.update_from_editmode();
+
 		BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_scene, true, !preview, need_undeformed);
 
 		if(b_mesh) {

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2013-07-08 22:41:12 UTC (rev 58083)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2013-07-08 22:41:14 UTC (rev 58084)
@@ -982,8 +982,13 @@
 	if (engine->update_flag & RE_ENGINE_UPDATE_OTHER)
 		job_update_flag |= PR_UPDATE_MATERIAL;
 	
-	if (engine->update_flag & RE_ENGINE_UPDATE_DATABASE)
+	if (engine->update_flag & RE_ENGINE_UPDATE_DATABASE) {
 		job_update_flag |= PR_UPDATE_DATABASE;
+
+		/* load editmesh */
+		if (scene->obedit)
+			ED_object_editmode_load(scene->obedit);
+	}
 	
 	engine->update_flag = 0;