diff options
author | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
commit | de6cee4fc1913982b0b2bd786bfd813c935bbe73 (patch) | |
tree | a726c0c63bbd1d6c47c90c32119ce14c8048cddc /source/blender/depsgraph/intern/depsgraph_query.cc | |
parent | e4d432500a0e2f978fe019da43deb843da405032 (diff) | |
parent | 88bb29dea668df8cc46aa7f55895f229748bdbb4 (diff) |
Merge branch 'master' into codesign_error_tracker
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_query.cc')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index fc9ed9a6ab9..d0eedd6d811 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include <string.h> // XXX: memcpy +#include <string.h> /* XXX: memcpy */ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BKE_action.h" // XXX: BKE_pose_channel_find_name +#include "BKE_action.h" /* XXX: BKE_pose_channel_find_name */ #include "BKE_customdata.h" #include "BKE_idtype.h" #include "BKE_main.h" |