[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44052] trunk/blender/source/blender/ editors/mesh/mesh_data.c: Fix #30152: Several drag and drop of image on mesh crashes

Sergey Sharybin sergey.vfx at gmail.com
Sun Feb 12 12:21:40 CET 2012


Revision: 44052
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44052
Author:   nazgul
Date:     2012-02-12 11:21:35 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Fix #30152: Several drag and drop of image on mesh crashes

Issue was caused by making and loading editMesh in drop_named_image_invoke,
which lead to freeing/changing pointers used by CustomData layers. Some of
this pointers might be used by DerivedMesh, so we need to update DerivedMesh
after loading EditMesh.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/mesh_data.c

Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c	2012-02-12 10:51:45 UTC (rev 44051)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c	2012-02-12 11:21:35 UTC (rev 44052)
@@ -403,6 +403,10 @@
 		free_editMesh(me->edit_mesh);
 		MEM_freeN(me->edit_mesh);
 		me->edit_mesh= NULL;
+
+		/* load_editMesh free's pointers used by CustomData layers which might be used by DerivedMesh too,
+		 * so signal to re-create DerivedMesh here (sergey) */
+		DAG_id_tag_update(&me->id, 0);
 	}
 
 	/* dummie drop support; ensure view shows a result :) */




More information about the Bf-blender-cvs mailing list