[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13015] trunk/blender/source/blender: == Multires ==

[Nicholas Bishop]

Revision: 13015
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13015
Author:   nicholasbishop
Date:     2007-12-27 08:27:03 +0100 (Thu, 27 Dec 2007)

Log Message:
-----------
== Multires ==

Fixed a crash on adding a UV layer to a multires mesh while in editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/include/multires.h
    trunk/blender/source/blender/src/buttons_editing.c
    trunk/blender/source/blender/src/multires.c

Modified: trunk/blender/source/blender/include/multires.h
===================================================================
--- trunk/blender/source/blender/include/multires.h	2007-12-26 23:08:00 UTC (rev 13014)
+++ trunk/blender/source/blender/include/multires.h	2007-12-27 07:27:03 UTC (rev 13015)
@@ -48,6 +48,7 @@
 void multires_make(void *ob, void *me);
 void multires_delete(void *ob, void *me);
 void multires_level_to_editmesh(struct Object *ob, struct Mesh *me, const int render);
+void multires_finish_mesh_update(struct Object *ob);
 void multires_subdivide(void *ob, void *me);
 void multires_del_lower(void *ob, void *me);
 void multires_del_higher(void *ob, void *me);

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2007-12-26 23:08:00 UTC (rev 13014)
+++ trunk/blender/source/blender/src/buttons_editing.c	2007-12-27 07:27:03 UTC (rev 13015)
@@ -739,6 +739,7 @@
 	if(me && me->mr) {
 		multires_delete_layer(me, &me->mr->fdata, type, layer - &data->layers[index]);
 		multires_level_to_editmesh(OBACT, me, 0);
+		multires_finish_mesh_update(OBACT);
 	}
 	else if(G.obedit) {
 		EM_free_data_layer(data, type);
@@ -4497,6 +4498,7 @@
 			if(me && me->mr) {
 				multires_add_layer(me, &me->mr->fdata, CD_MTFACE, layernum);
 				multires_level_to_editmesh(ob, me, 0);
+				multires_finish_mesh_update(ob);
 			}
 			else if(G.obedit) {
 				EM_add_data_layer(&em->fdata, CD_MTFACE);

Modified: trunk/blender/source/blender/src/multires.c
===================================================================
--- trunk/blender/source/blender/src/multires.c	2007-12-26 23:08:00 UTC (rev 13014)
+++ trunk/blender/source/blender/src/multires.c	2007-12-27 07:27:03 UTC (rev 13015)
@@ -349,7 +349,7 @@
 	BIF_undo_push("Multires delete higher");
 }
 
-static void multires_finish_mesh_update(Object *ob)
+void multires_finish_mesh_update(Object *ob)
 {
 	/* friendly check for background render */
 	if(G.background==0) {