[Bf-blender-cvs] [ba01ea3f8be] master: Merge remote-tracking branch 'origin/blender-v2.82-release'

Sybren A. Stüvel noreply at git.blender.org
Tue Jan 28 16:35:14 CET 2020


Commit: ba01ea3f8bee7ea18e2bda07872668ab57d27ca6
Author: Sybren A. Stüvel
Date:   Tue Jan 28 16:34:33 2020 +0100
Branches: master
https://developer.blender.org/rBba01ea3f8bee7ea18e2bda07872668ab57d27ca6

Merge remote-tracking branch 'origin/blender-v2.82-release'

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 8ff99816908,712d9d23128..b2eb004db27
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -195,12 -194,21 +195,21 @@@ bool object_particles_depends_on_time(O
  bool check_id_has_anim_component(ID *id)
  {
    AnimData *adt = BKE_animdata_from_id(id);
 -  if (adt == NULL) {
 +  if (adt == nullptr) {
      return false;
    }
 -  return (adt->action != NULL) || (!BLI_listbase_is_empty(&adt->nla_tracks));
 +  return (adt->action != nullptr) || (!BLI_listbase_is_empty(&adt->nla_tracks));
  }
  
+ bool check_id_has_driver_component(ID *id)
+ {
+   AnimData *adt = BKE_animdata_from_id(id);
+   if (adt == nullptr) {
+     return false;
+   }
+   return !BLI_listbase_is_empty(&adt->drivers);
+ }
+ 
  OperationCode bone_target_opcode(ID *target,
                                   const char *subtarget,
                                   ID *id,



More information about the Bf-blender-cvs mailing list