Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-03-13 14:42:32 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-03-13 14:42:32 +0300
commit733f65cb537c283385f5d676bf4436cf03227307 (patch)
treed381ef9803d92ca7ce91fe91eeb71af478af96a4 /source/blender/src/buttons_editing.c
parente6252661627407c8ed1004856ccfc67d32cf825d (diff)
Fix for bug #8387: active uv layer index could become invalid in editmode.
Diffstat (limited to 'source/blender/src/buttons_editing.c')
-rw-r--r--source/blender/src/buttons_editing.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 37d783cde2a..edd9a2ff827 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -4704,21 +4704,19 @@ void do_meshbuts(unsigned short event)
break;
case B_NEWTFACE:
- if(me)
- layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
- else
- layernum= CustomData_number_of_layers(&em->fdata, CD_MTFACE);
-
if(me && me->mr) {
+ layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
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) {
+ layernum= CustomData_number_of_layers(&em->fdata, CD_MTFACE);
EM_add_data_layer(&em->fdata, CD_MTFACE);
CustomData_set_layer_active(&em->fdata, CD_MTFACE, layernum);
}
else if(me) {
+ layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
if(me->mtface)
CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DUPLICATE,
me->mtface, me->totface);