[Bf-blender-cvs] [3b3e6127520] blender2.8: Merge branch 'master' into blender2.8
Sergey Sharybin
noreply at git.blender.org
Mon Dec 4 15:15:54 CET 2017
Commit: 3b3e6127520de14e2cf92f371281f66ebcec3756
Author: Sergey Sharybin
Date: Mon Dec 4 15:14:47 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB3b3e6127520de14e2cf92f371281f66ebcec3756
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index c4542660c8b,19533272ef5..dfe97d02ec6
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@@ -247,10 -195,10 +247,10 @@@ void DepsgraphNodeBuilder::build_rig(Ob
op_node->set_as_exit();
/* bones */
- LINKLIST_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
+ LINKLIST_FOREACH (bPoseChannel *, pchan, &object_cow->pose->chanbase) {
- /* node for bone eval */
- op_node = add_operation_node(&object->id, DEG_NODE_TYPE_BONE,
- pchan->name, NULL, DEG_OPCODE_BONE_LOCAL);
+ /* Node for bone evaluation. */
+ op_node = add_operation_node(&object->id, DEG_NODE_TYPE_BONE, pchan->name, NULL,
+ DEG_OPCODE_BONE_LOCAL);
op_node->set_as_entry();
add_operation_node(&object->id, DEG_NODE_TYPE_BONE, pchan->name,
@@@ -269,7 -213,15 +269,15 @@@
function_bind(BKE_pose_bone_done, _1, pchan),
DEG_OPCODE_BONE_DONE);
op_node->set_as_exit();
+ /* Custom properties. */
+ if (pchan->prop != NULL) {
+ add_operation_node(&object->id,
+ DEG_NODE_TYPE_PARAMETERS,
+ NULL,
+ DEG_OPCODE_PARAMETERS_EVAL,
+ pchan->name);
+ }
- /* Constraints. */
+ /* Build constraints. */
if (pchan->constraints.first != NULL) {
build_pose_constraints(object, pchan);
}
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 1b9f27932f5,275c6847e43..aeb9f9ab937
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -1096,8 -1058,9 +1082,8 @@@ void DepsgraphRelationBuilder::build_dr
/* Shape key driver - hook into the base geometry operation. */
// XXX: double check where this points
Key *shape_key = (Key *)id;
-
ComponentKey geometry_key(shape_key->from, DEG_NODE_TYPE_GEOMETRY);
- add_relation(driver_key, geometry_key, "[Driver -> ShapeKey Geom]");
+ add_relation(driver_key, geometry_key, "Driver -> ShapeKey Geom");
}
else if (strstr(rna_path, "key_blocks[")) {
ComponentKey geometry_key(id, DEG_NODE_TYPE_GEOMETRY);
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index ce63d6455cc,ff805240799..2a2108e8480
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@@ -410,9 -414,10 +410,9 @@@ void DepsgraphRelationBuilder::build_ri
}
OperationKey parent_key(&object->id, DEG_NODE_TYPE_BONE, pchan->parent->name, parent_key_opcode);
- add_relation(parent_key, bone_pose_key, "[Parent Bone -> Child Bone]");
+ add_relation(parent_key, bone_pose_key, "Parent Bone -> Child Bone");
}
-
- /* constraints */
+ /* Buil constraints. */
if (pchan->constraints.first != NULL) {
/* constraints stack and constraint dependencies */
build_constraints(&object->id, DEG_NODE_TYPE_BONE, pchan->name, &pchan->constraints, &root_map);
diff --cc source/blender/editors/mesh/editmesh_select.c
index 0a0a8ff2de3,77a107534dd..a075ed657d1
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@@ -1583,10 -1573,18 +1583,18 @@@ static bool mouse_mesh_loop(bContext *C
mvalf[1] = (float)(vc.mval[1] = mval[1]);
em = vc.em;
+ /* Make sure that the edges are also considered for selection.
+ * TODO: cleanup: add `selectmode` as a parameter */
+ const short ts_selectmode = vc.scene->toolsettings->selectmode;
+ vc.scene->toolsettings->selectmode |= SCE_SELECT_EDGE;
+
/* no afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad */
- ED_view3d_backbuf_validate(&vc);
+ ED_view3d_backbuf_validate(&eval_ctx, &vc);
+ /* restore `selectmode` */
+ vc.scene->toolsettings->selectmode = ts_selectmode;
+
- eed = EDBM_edge_find_nearest_ex(&vc, &dist, NULL, true, true, NULL);
+ eed = EDBM_edge_find_nearest_ex(&eval_ctx, &vc, &dist, NULL, true, true, NULL);
if (eed == NULL) {
return false;
}
More information about the Bf-blender-cvs
mailing list