Revision: 48379
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48379
Author: campbellbarton
Date: 2012-06-28 15:41:44 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48375:48378
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48375
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48375
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48378
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
2012-06-28 15:34:21 UTC (rev 48378)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
2012-06-28 15:41:44 UTC (rev 48379)
@@ -2855,7 +2855,7 @@
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);
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48375
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48378
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48375
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48378
Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform.c
2012-06-28 15:34:21 UTC (rev 48378)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform.c
2012-06-28 15:41:44 UTC (rev 48379)
@@ -5012,9 +5012,7 @@
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 @@
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
