Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-02-11 12:28:59 +0300
committerJeroen Bakker <jeroen@blender.org>2022-02-11 12:28:59 +0300
commitf19585656f62935c93c6b85a0778327d0064fa3a (patch)
treec8985b170853b7752be0fb32d1f2b313d22fdeb9 /source/blender/blenkernel/intern/lib_query.c
parentbccdb143db1319a8c7e6df86767513f728c9c86f (diff)
Fix compile warnings.
We should change the API of ntree so we can check with a const. I added this as a todo for now and used a const cast.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_query.c')
-rw-r--r--source/blender/blenkernel/intern/lib_query.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index 2a532cb0175..ba009072db8 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -377,7 +377,10 @@ uint64_t BKE_library_id_can_use_filter_id(const ID *id_owner)
return FILTER_ID_ALL;
}
- if (ntreeFromID(id_owner)) {
+ /* Casting to non const.
+ * TODO(jbakker): We should introduce a ntree_id_has_tree function as we are actually not
+ * interested in the result. */
+ if (ntreeFromID((ID *)id_owner)) {
return FILTER_ID_ALL;
}
@@ -453,7 +456,7 @@ uint64_t BKE_library_id_can_use_filter_id(const ID *id_owner)
case ID_SIM:
return FILTER_ID_OB | FILTER_ID_IM;
case ID_WM:
- return FILTER_ID_SCE, FILTER_ID_WS;
+ return FILTER_ID_SCE | FILTER_ID_WS;
case ID_IM:
case ID_VF:
case ID_TXT: