[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58026] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Jul 6 00:07:39 CEST 2013
Revision: 58026
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58026
Author: gdh
Date: 2013-07-05 22:07:39 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58025 to r58025.
This was an attempt to merge without problems. I added one step to the
merge process: building. If it fails, my script does not automatically
commit. Hopefully, that will help catch errors sooner rather than later.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58025
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58025
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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/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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58001
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58025
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c 2013-07-05 21:13:32 UTC (rev 58025)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c 2013-07-05 22:07:39 UTC (rev 58026)
@@ -428,7 +428,7 @@
float len_best = FLT_MAX;
if (use_normals)
- BLI_assert(fabsf(len_squared_v3(no) - 1.0f) < FLT_EPSILON);
+ BLI_ASSERT_UNIT_V3(no);
for (el_store = eloops->first; el_store; el_store = el_store->next) {
float len;
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c 2013-07-05 21:13:32 UTC (rev 58025)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c 2013-07-05 22:07:39 UTC (rev 58026)
@@ -721,17 +721,23 @@
else if (ese->htype == BM_EDGE) {
BMEdge *eed = (BMEdge *)ese->ele;
- /* the plane is simple, it runs along the edge
- * however selecting different edges can swap the direction of the y axis.
- * this makes it less likely for the y axis of the manipulator
- * (running along the edge).. to flip less often.
- * at least its more predictable */
- if (eed->v2->co[1] > eed->v1->co[1]) { /* check which to do first */
- sub_v3_v3v3(r_plane, eed->v2->co, eed->v1->co);
+ if (BM_edge_is_boundary(eed)) {
+ sub_v3_v3v3(r_plane, eed->l->v->co, eed->l->next->v->co);
}
else {
- sub_v3_v3v3(r_plane, eed->v1->co, eed->v2->co);
+ /* the plane is simple, it runs along the edge
+ * however selecting different edges can swap the direction of the y axis.
+ * this makes it less likely for the y axis of the manipulator
+ * (running along the edge).. to flip less often.
+ * at least its more predictable */
+ if (eed->v2->co[1] > eed->v1->co[1]) { /* check which to do first */
+ sub_v3_v3v3(r_plane, eed->v2->co, eed->v1->co);
+ }
+ else {
+ sub_v3_v3v3(r_plane, eed->v1->co, eed->v2->co);
+ }
}
+
normalize_v3(r_plane);
}
else if (ese->htype == BM_FACE) {
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c 2013-07-05 21:13:32 UTC (rev 58025)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c 2013-07-05 22:07:39 UTC (rev 58026)
@@ -189,7 +189,10 @@
((BMVert *)(((LinkData *)lb_b->first)->data))->co,
((BMVert *)(((LinkData *)lb_b->last)->data))->co);
- /* this isnt totally reliable but works well in most cases */
+ /* make the directions point out from the normals, 'no' is used as a temp var */
+ cross_v3_v3v3(no, dir_a, el_dir); cross_v3_v3v3(dir_a, no, el_dir);
+ cross_v3_v3v3(no, dir_b, el_dir); cross_v3_v3v3(dir_b, no, el_dir);
+
if (dot_v3v3(dir_a, dir_b) < 0.0f) {
BM_edgeloop_flip(bm, el_store_b);
}
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c 2013-07-05 21:13:32 UTC (rev 58025)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c 2013-07-05 22:07:39 UTC (rev 58026)
@@ -3911,7 +3911,7 @@
/* Properties.*/
/* TODO, use vgroup_operator_subset_select_props for group_select_mode */
- ot->prop = RNA_def_enum(ot->srna, "group_select_mode", WT_vertex_group_mode_item, WT_REPLACE_ACTIVE_VERTEX_GROUP, "Group", "");
+ ot->prop = RNA_def_enum(ot->srna, "group_select_mode", WT_vertex_group_mode_item, WT_REPLACE_ALL_VERTEX_GROUPS, "Group", "");
ot->prop = RNA_def_enum(ot->srna, "method", WT_method_item, WT_BY_NEAREST_FACE, "Method", "");
ot->prop = RNA_def_enum(ot->srna, "replace_mode", WT_replace_mode_item, WT_REPLACE_ALL_WEIGHTS, "Replace", "");
}
Modified: branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c 2013-07-05 21:13:32 UTC (rev 58025)
+++ branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c 2013-07-05 22:07:39 UTC (rev 58026)
@@ -4149,10 +4149,15 @@
void init_render_world(Render *re)
{
+ void *wrld_prev[2] = {
+ re->wrld.aotables,
+ re->wrld.aosphere,
+ };
+
int a;
if (re->scene && re->scene->world) {
- re->wrld= *(re->scene->world);
+ re->wrld = *(re->scene->world);
copy_v3_v3(re->grvec, re->viewmat[2]);
normalize_v3(re->grvec);
@@ -4181,6 +4186,10 @@
re->wrld.linfac= 1.0f + powf((2.0f*re->wrld.exp + 0.5f), -10);
re->wrld.logfac= logf((re->wrld.linfac-1.0f)/re->wrld.linfac) / re->wrld.range;
+
+ /* restore runtime vars, needed for viewport rendering [#36005] */
+ re->wrld.aotables = wrld_prev[0];
+ re->wrld.aosphere = wrld_prev[1];
}
More information about the Bf-blender-cvs
mailing list