[Bf-blender-cvs] [a11b21f1eb7] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: a11b21f1eb78d5df225cc7798b2084e9183f5020
Author: Jacques Lucke
Date:   Wed Jan 29 21:14:40 2020 +0100
Branches: functions
https://developer.blender.org/rBa11b21f1eb78d5df225cc7798b2084e9183f5020

Merge branch 'master' into functions

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index e9412775fcb,5214fdbd246..a620cdb3648
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -1534,9 -1547,8 +1547,9 @@@ void DepsgraphRelationBuilder::build_dr
        /* Special handling for directly-named bones. */
        if ((dtar->flag & DTAR_FLAG_STRUCT_REF) && (object && object->type == OB_ARMATURE) &&
            (dtar->pchan_name[0])) {
 +
          bPoseChannel *target_pchan = BKE_pose_channel_find_name(object->pose, dtar->pchan_name);
-         if (target_pchan == NULL) {
+         if (target_pchan == nullptr) {
            continue;
          }
          OperationKey variable_key(