Make GS macro return proper IDType type
Previously it was returning short, which was really easy to (a) compare against non-ID type value (b) forget to handle some specific value in switch statement. Both issues happened in the nearest past, so it's time to tighten some nuts here. Most of the change related on silencing strict compiler warning now, but there is also one tricky aspect: ID_NLA is not in the IDType enum. So there is still cast to short to handle that switch. If someone has better ideas how to deal with this please go ahead :)
This commit is contained in:
@@ -624,6 +624,8 @@ char *BKE_animdata_driver_path_hack(bContext *C, PointerRNA *ptr, PropertyRNA *p
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* fix RNA pointer, as we've now changed the ID root by changing the paths */
|
||||
|
||||
@@ -253,6 +253,8 @@ PreviewImage **BKE_previewimg_id_get_p(const ID *id)
|
||||
ID_PRV_CASE(ID_GR, Group);
|
||||
ID_PRV_CASE(ID_SCE, Scene);
|
||||
#undef ID_PRV_CASE
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
||||
@@ -146,6 +146,9 @@ Key *BKE_key_add(ID *id) /* common function */
|
||||
key->elemsize = 16;
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return key;
|
||||
@@ -1406,6 +1409,8 @@ Key **BKE_key_from_id_p(ID *id)
|
||||
Lattice *lt = (Lattice *)id;
|
||||
return <->key;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
||||
@@ -361,6 +361,8 @@ Material ***give_matarar_id(ID *id)
|
||||
return &(((Curve *)id)->mat);
|
||||
case ID_MB:
|
||||
return &(((MetaBall *)id)->mat);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -377,6 +379,8 @@ short *give_totcolp_id(ID *id)
|
||||
return &(((Curve *)id)->totcol);
|
||||
case ID_MB:
|
||||
return &(((MetaBall *)id)->totcol);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -396,6 +400,8 @@ static void material_data_index_remove_id(ID *id, short index)
|
||||
case ID_MB:
|
||||
/* meta-elems don't have materials atm */
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -414,6 +420,8 @@ static void material_data_index_clear_id(ID *id)
|
||||
case ID_MB:
|
||||
/* meta-elems don't have materials atm */
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -481,6 +481,8 @@ bool BKE_object_defgroup_array_get(ID *id, MDeformVert **dvert_arr, int *dvert_t
|
||||
*dvert_tot = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -522,6 +522,8 @@ static void unpack_generate_paths(
|
||||
case ID_IM:
|
||||
BLI_snprintf(r_relpath, relpathlen, "//textures/%s", tempname);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
{
|
||||
@@ -712,6 +714,8 @@ bool BKE_pack_check(ID *id)
|
||||
Library *li = (Library *)id;
|
||||
return li->packedfile != NULL;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -750,5 +754,7 @@ void BKE_unpack_id(Main *bmain, ID *id, ReportList *reports, int how)
|
||||
BKE_reportf(reports, RPT_ERROR, "Cannot unpack individual Library file, '%s'", li->name);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -377,6 +377,8 @@ static void seqclipboard_ptr_restore(Main *bmain, ID **id_pt)
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1129,6 +1129,8 @@ void set_active_mtex(ID *id, short act)
|
||||
case ID_PA:
|
||||
((ParticleSettings *)id)->texact = act;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user