[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59287] branches/soc-2013-depsgraph_mt: Merging r59258 through r59285 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Mon Aug 19 13:26:21 CEST 2013
Revision: 59287
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59287
Author: nazgul
Date: 2013-08-19 11:26:21 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Merging r59258 through r59285 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59258
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59285
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_rip.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59257
+ /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59285
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c 2013-08-19 11:24:35 UTC (rev 59286)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c 2013-08-19 11:26:21 UTC (rev 59287)
@@ -2293,7 +2293,7 @@
mball_count(&process, scene, ob);
if (process.totelem == 0) return;
- if ((for_render == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
+ if ((for_render == false) && (mb->flag == MB_UPDATE_NEVER)) return;
if ((G.moving & (G_TRANSFORM_OBJ | G_TRANSFORM_EDIT)) && mb->flag == MB_UPDATE_FAST) return;
process.thresh = mb->thresh;
Modified: branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.c 2013-08-19 11:24:35 UTC (rev 59286)
+++ branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.c 2013-08-19 11:26:21 UTC (rev 59287)
@@ -992,6 +992,25 @@
}
/**
+ * \brief Return the Loop Shared by Edge and Vert
+ *
+ * Finds the loop used which uses \a in face loop \a l
+ *
+ * \note this function takes a loop rather then an edge
+ * so we can select the face that the loop should be from.
+ */
+BMLoop *BM_edge_vert_share_loop(BMLoop *l, BMVert *v)
+{
+ BLI_assert(BM_vert_in_edge(l->e, v));
+ if (l->v == v) {
+ return l;
+ }
+ else {
+ return l->next;
+ }
+}
+
+/**
* \brief Return the Loop Shared by Face and Vertex
*
* Finds the loop used which uses \a v in face loop \a l
Modified: branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.h 2013-08-19 11:24:35 UTC (rev 59286)
+++ branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.h 2013-08-19 11:26:21 UTC (rev 59287)
@@ -106,6 +106,7 @@
bool BM_edge_share_vert_check(BMEdge *e1, BMEdge *e2);
BMVert *BM_edge_share_vert(BMEdge *e1, BMEdge *e2);
+BMLoop *BM_edge_vert_share_loop(BMLoop *l, BMVert *v);
BMLoop *BM_face_vert_share_loop(BMFace *f, BMVert *v);
BMLoop *BM_face_edge_share_loop(BMFace *f, BMEdge *e);
Modified: branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_edgesplit.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_edgesplit.c 2013-08-19 11:24:35 UTC (rev 59286)
+++ branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_edgesplit.c 2013-08-19 11:26:21 UTC (rev 59287)
@@ -193,11 +193,13 @@
bmesh_vert_separate(bm, v, &vtar, &vtar_len, copy_select);
- if (vtar_len) {
+ /* first value is always in 'v' */
+ if (vtar_len > 1) {
BMEditSelection *ese = BLI_ghash_lookup(ese_gh, v);
+ BLI_assert(v == vtar[0]);
if (UNLIKELY(ese)) {
int j;
- for (j = 0; j < vtar_len; j++) {
+ for (j = 1; j < vtar_len; j++) {
BLI_assert(v != vtar[j]);
BM_select_history_store_after_notest(bm, ese, vtar[j]);
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_MemoryBuffer.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_MemoryBuffer.cpp 2013-08-19 11:24:35 UTC (rev 59286)
+++ branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_MemoryBuffer.cpp 2013-08-19 11:26:21 UTC (rev 59287)
@@ -335,8 +335,7 @@
float tc[4];
const float wt = EWA_WTS[(Q < 0.f) ? 0 : (unsigned int)Q];
read(tc, clipuv(u, width), clipuv(v, height));
- madd_v3_v3fl(result, tc, wt);
- result[3] += result[3] ? tc[3] * wt : 0.f;
+ madd_v4_v4fl(result, tc, wt);
d += wt;
}
Q += DQ;
@@ -346,9 +345,5 @@
// d should hopefully never be zero anymore
d = 1.f / d;
- result[0] *= d;
- result[1] *= d;
- result[2] *= d;
- // clipping can be ignored if alpha used, texr->ta already includes filtered edge
- result[3] = result[3] ? result[3] * d : 1.f;
+ mul_v4_fl(result, d);
}
Property changes on: branches/soc-2013-depsgraph_mt/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/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/interface/interface.c:57395-59257
+ /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/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/interface/interface.c:57395-59285
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_rip.c 2013-08-19 11:24:35 UTC (rev 59286)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_rip.c 2013-08-19 11:26:21 UTC (rev 59287)
@@ -60,23 +60,29 @@
* point and would result in the same distance.
*/
#define INSET_DEFAULT 0.00001f
-static float edbm_rip_edgedist(ARegion *ar, float mat[4][4],
- const float co1[3], const float co2[3], const float mvalf[2],
- const float inset)
+static float edbm_rip_edgedist_squared(ARegion *ar, float mat[4][4],
+ const float co1[3], const float co2[3], const float mvalf[2],
+ const float inset)
{
- float vec1[2], vec2[2];
+ float vec1[2], vec2[2], dist_sq;
ED_view3d_project_float_v2_m4(ar, co1, vec1, mat);
ED_view3d_project_float_v2_m4(ar, co2, vec2, mat);
if (inset != 0.0f) {
- const float dist = inset / len_v2v2(vec1, vec2);
- interp_v2_v2v2(vec1, vec1, vec2, dist);
- interp_v2_v2v2(vec2, vec2, vec1, dist);
+ const float dist_2d = len_v2v2(vec1, vec2);
+ if (dist_2d > FLT_EPSILON) {
+ const float dist = inset / dist_2d;
+ BLI_assert(isfinite(dist));
+ interp_v2_v2v2(vec1, vec1, vec2, dist);
+ interp_v2_v2v2(vec2, vec2, vec1, dist);
+ }
}
- /* TODO: use dist_squared_to_line_segment_v2() looks like we only ever use for comparison */
- return dist_to_line_segment_v2(mvalf, vec1, vec2);
+ dist_sq = dist_squared_to_line_segment_v2(mvalf, vec1, vec2);
+ BLI_assert(isfinite(dist_sq));
+
+ return dist_sq;
}
#if 0
@@ -525,11 +531,11 @@
BMIter iter, liter;
BMLoop *l;
BMEdge *e, *e2;
- BMVert *v, *ripvert = NULL;
+ BMVert *v;
const int totvert_orig = bm->totvert;
int i;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list