Revision: 60964
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60964
Author: nazgul
Date: 2013-10-28 10:42:08 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
Merging r60962 through r60963 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60962
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60963
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
Property Changed:
----------------
branches/soc-2011-tomato/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-60961
+ /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-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-60963
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
2013-10-28 10:39:53 UTC (rev 60963)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
2013-10-28 10:42:08 UTC (rev 60964)
@@ -389,7 +389,7 @@
}
/* need to rebuild entirely because array size changes */
- BM_mesh_elem_table_init(em, BM_VERT);
+ BM_mesh_elem_table_init(em->bm, BM_VERT);
/* create faces */
for (j = 0; j < trinum; j++) {
@@ -404,9 +404,9 @@
face[k] = uniquevbase + tri[k] - nv;
/* unique vertex */
}
newFace = BM_face_create_quad_tri(em->bm,
- BM_vert_at_index(em,
face[0]),
- BM_vert_at_index(em,
face[2]),
- BM_vert_at_index(em,
face[1]), NULL,
+
BM_vert_at_index(em->bm, face[0]),
+
BM_vert_at_index(em->bm, face[2]),
+
BM_vert_at_index(em->bm, face[1]), NULL,
NULL, false);
/* set navigation polygon idx to the custom layer */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
