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.
This commit is contained in:
parent
bccdb143db
commit
f19585656f
|
@ -36,7 +36,7 @@ bool id_can_have_animdata(const struct ID *id);
|
|||
/**
|
||||
* Get #AnimData from the given ID-block.
|
||||
*/
|
||||
struct AnimData *BKE_animdata_from_id(struct ID *id);
|
||||
struct AnimData *BKE_animdata_from_id(const struct ID *id);
|
||||
|
||||
/**
|
||||
* Ensure #AnimData exists in the given ID-block (when supported).
|
||||
|
|
|
@ -72,7 +72,7 @@ bool id_can_have_animdata(const ID *id)
|
|||
return id_type_can_have_animdata(GS(id->name));
|
||||
}
|
||||
|
||||
AnimData *BKE_animdata_from_id(ID *id)
|
||||
AnimData *BKE_animdata_from_id(const ID *id)
|
||||
{
|
||||
/* In order for this to work, we assume that the #AnimData pointer is stored
|
||||
* immediately after the given ID-block in the struct, as per IdAdtTemplate. */
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue