[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26309] trunk/blender/source/blender: Fix Blend From Shape having no effect after exiting edit mode.

[Brecht Van Lommel]

Revision: 26309
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26309
Author:   blendix
Date:     2010-01-26 18:39:45 +0100 (Tue, 26 Jan 2010)

Log Message:
-----------
Fix Blend From Shape having no effect after exiting edit mode.

Also added a UI string for mesh selection mode property to show
up in undo stack.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c        2010-01-26 
17:37:44 UTC (rev 26308)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c        2010-01-26 
17:39:45 UTC (rev 26309)
@@ -1558,7 +1558,7 @@
        EditFaceC *faces;
        EditSelectionC *selected;
        int totvert, totedge, totface, totsel;
-       short selectmode;
+       int selectmode, shapenr;
        RetopoPaintData *retopo_paint_data;
        char retopo_mode;
        CustomData vdata, edata, fdata;
@@ -1598,6 +1598,7 @@
        um= MEM_callocN(sizeof(UndoMesh), "undomesh");
        
        um->selectmode = em->selectmode;
+       um->shapenr = em->shapenr;
        
        for(eve=em->verts.first; eve; eve= eve->next) um->totvert++;
        for(eed=em->edges.first; eed; eed= eed->next) um->totedge++;
@@ -1700,6 +1701,7 @@
        memset(em, 0, sizeof(EditMesh));
                
        em->selectmode = um->selectmode;
+       em->shapenr = um->shapenr;
        
        init_editmesh_fastmalloc(em, um->totvert, um->totedge, um->totface);
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c    2010-01-26 
17:37:44 UTC (rev 26308)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c    2010-01-26 
17:39:45 UTC (rev 26309)
@@ -835,6 +835,7 @@
        RNA_def_property_boolean_sdna(prop, NULL, "selectmode", 1);
        RNA_def_property_array(prop, 3);
        RNA_def_property_boolean_funcs(prop, NULL, 
"rna_Scene_editmesh_select_mode_set");
+       RNA_def_property_ui_text(prop, "Mesh Selection Mode", "Which mesh 
elements selection works on.");
        RNA_def_property_update(prop, 0, 
"rna_Scene_editmesh_select_mode_update");
 
        prop= RNA_def_property(srna, "vertex_group_weight", PROP_FLOAT, 
PROP_FACTOR);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs