griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r48375:48378

Browse Source
This commit is contained in:
Campbell Barton
2012-06-28 15:41:44 +00:00
parent 420150f752 bee0f76f26
commit 1a2852cf1c
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/image.c
View File

@@ -2855,7 +2855,7 @@ void BKE_image_user_file_path(ImageUser *iuser, Image *ima, char *filepath)
if (ima->source == IMA_SRC_SEQUENCE) {
char head[FILE_MAX], tail[FILE_MAX];
unsigned short numlen;
int frame = iuser->framenr;
int frame = iuser ? iuser->framenr : ima->lastframe;
BLI_stringdec(filepath, head, tail, &numlen);
BLI_stringenc(filepath, head, tail, numlen, frame);

24
source/blender/editors/transform/transform.c
View File

@@ -5012,9 +5012,7 @@ void projectSVData(TransInfo *t, int final)
for (i = 0, sv = sld->sv; i < sld->totsv; sv++, i++) {
BMIter fiter;
BMFace *f;
BMIter liter_v;
BMLoop *l_v;
/* BMESH_TODO, this interpolates between vertex/loops which are not moved
* (are only apart of a face attached to a slide vert), couldn't we iterate BM_LOOPS_OF_VERT
* here and only interpolate those? */
@@ -5139,26 +5137,6 @@ void projectSVData(TransInfo *t, int final)
BM_elem_hide_set(em->bm, f, is_hide);
}
}
/* make sure every loop of the vertex has identical uv data. Use this temporarily to
* fix #31581 until proper data correction/ support for islands is done */
/* XXX - this only does the active UV layer which is not really good, should do _all_ uv's - campbell */
if (has_uv) {
float uv_med[2] = {0.0, 0.0};
int tot_loops = 0;
BM_ITER_ELEM (l_v, &liter_v, sv->v, BM_LOOPS_OF_VERT) {
MLoopUV *uv = CustomData_bmesh_get(&em->bm->ldata, l_v->head.data, CD_MLOOPUV);
add_v2_v2(uv_med, uv->uv);
tot_loops++;
}
mul_v2_fl(uv_med, 1.0/tot_loops);
BM_ITER_ELEM (l_v, &liter_v, sv->v, BM_LOOPS_OF_VERT) {
MLoopUV *uv = CustomData_bmesh_get(&em->bm->ldata, l_v->head.data, CD_MLOOPUV);
copy_v2_v2(uv->uv, uv_med);
}
}
}
BLI_smallhash_release(&visit);