Cleanup: remove unused field args
This commit is contained in:
parent
6b551c0b8c
commit
bb9b0fcdbe
|
@ -32,7 +32,7 @@
|
|||
|
||||
extern "C" {
|
||||
size_t BLI_timecode_string_from_time_simple(char *str, size_t maxlen, double time_seconds);
|
||||
void BKE_image_user_frame_calc(void *iuser, int cfra, int fieldnr);
|
||||
void BKE_image_user_frame_calc(void *iuser, int cfra);
|
||||
void BKE_image_user_file_path(void *iuser, void *ima, char *path);
|
||||
unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame);
|
||||
float *BKE_image_get_float_pixels_for_frame(void *image, int frame);
|
||||
|
@ -220,14 +220,14 @@ static inline string image_user_file_path(BL::ImageUser& iuser,
|
|||
int cfra)
|
||||
{
|
||||
char filepath[1024];
|
||||
BKE_image_user_frame_calc(iuser.ptr.data, cfra, 0);
|
||||
BKE_image_user_frame_calc(iuser.ptr.data, cfra);
|
||||
BKE_image_user_file_path(iuser.ptr.data, ima.ptr.data, filepath);
|
||||
return string(filepath);
|
||||
}
|
||||
|
||||
static inline int image_user_frame_number(BL::ImageUser& iuser, int cfra)
|
||||
{
|
||||
BKE_image_user_frame_calc(iuser.ptr.data, cfra, 0);
|
||||
BKE_image_user_frame_calc(iuser.ptr.data, cfra);
|
||||
return iuser.frame_current();
|
||||
}
|
||||
|
||||
|
|
|
@ -211,9 +211,9 @@ struct Image *BKE_image_verify_viewer(struct Main *bmain, int type, const char *
|
|||
void BKE_image_verify_viewer_views(const struct RenderData *rd, struct Image *ima, struct ImageUser *iuser);
|
||||
|
||||
/* called on frame change or before render */
|
||||
void BKE_image_user_frame_calc(struct ImageUser *iuser, int cfra, int fieldnr);
|
||||
void BKE_image_user_check_frame_calc(struct ImageUser *iuser, int cfra, int fieldnr);
|
||||
int BKE_image_user_frame_get(const struct ImageUser *iuser, int cfra, int fieldnr, bool *r_is_in_range);
|
||||
void BKE_image_user_frame_calc(struct ImageUser *iuser, int cfra);
|
||||
void BKE_image_user_check_frame_calc(struct ImageUser *iuser, int cfra);
|
||||
int BKE_image_user_frame_get(const struct ImageUser *iuser, int cfra, bool *r_is_in_range);
|
||||
void BKE_image_user_file_path(struct ImageUser *iuser, struct Image *ima, char *path);
|
||||
void BKE_image_update_frame(const struct Main *bmain, int cfra);
|
||||
|
||||
|
|
|
@ -3417,7 +3417,7 @@ static ImBuf *load_image_single(
|
|||
flag |= imbuf_alpha_flags_for_image(ima);
|
||||
|
||||
/* get the correct filepath */
|
||||
BKE_image_user_frame_calc(iuser, cfra, 0);
|
||||
BKE_image_user_frame_calc(iuser, cfra);
|
||||
|
||||
if (iuser)
|
||||
iuser_t = *iuser;
|
||||
|
@ -4172,7 +4172,7 @@ void BKE_image_pool_release_ibuf(Image *ima, ImBuf *ibuf, ImagePool *pool)
|
|||
}
|
||||
}
|
||||
|
||||
int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, bool *r_is_in_range)
|
||||
int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, bool *r_is_in_range)
|
||||
{
|
||||
const int len = iuser->frames;
|
||||
|
||||
|
@ -4227,11 +4227,11 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, bool
|
|||
}
|
||||
}
|
||||
|
||||
void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
|
||||
void BKE_image_user_frame_calc(ImageUser *iuser, int cfra)
|
||||
{
|
||||
if (iuser) {
|
||||
bool is_in_range;
|
||||
const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr, &is_in_range);
|
||||
const int framenr = BKE_image_user_frame_get(iuser, cfra, &is_in_range);
|
||||
|
||||
if (is_in_range) {
|
||||
iuser->flag |= IMA_USER_FRAME_IN_RANGE;
|
||||
|
@ -4250,10 +4250,10 @@ void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
|
|||
}
|
||||
}
|
||||
|
||||
void BKE_image_user_check_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
|
||||
void BKE_image_user_check_frame_calc(ImageUser *iuser, int cfra)
|
||||
{
|
||||
if ((iuser->flag & IMA_ANIM_ALWAYS) || (iuser->flag & IMA_NEED_FRAME_RECALC)) {
|
||||
BKE_image_user_frame_calc(iuser, cfra, fieldnr);
|
||||
BKE_image_user_frame_calc(iuser, cfra);
|
||||
|
||||
iuser->flag &= ~IMA_NEED_FRAME_RECALC;
|
||||
}
|
||||
|
@ -4264,7 +4264,7 @@ static void image_update_frame(struct Image *UNUSED(ima), struct ImageUser *iuse
|
|||
{
|
||||
int cfra = *(int *)customdata;
|
||||
|
||||
BKE_image_user_check_frame_calc(iuser, cfra, 0);
|
||||
BKE_image_user_check_frame_calc(iuser, cfra);
|
||||
}
|
||||
|
||||
void BKE_image_update_frame(const Main *bmain, int cfra)
|
||||
|
|
|
@ -235,7 +235,7 @@ void BKE_object_handle_data_update(
|
|||
case OB_EMPTY:
|
||||
if (ob->empty_drawtype == OB_EMPTY_IMAGE && ob->data)
|
||||
if (BKE_image_is_animated(ob->data))
|
||||
BKE_image_user_check_frame_calc(ob->iuser, (int)ctime, 0);
|
||||
BKE_image_user_check_frame_calc(ob->iuser, (int)ctime);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo
|
|||
int framenumber = context.getFramenumber();
|
||||
int numberOfOutputs = this->getNumberOfOutputSockets();
|
||||
bool outputStraightAlpha = (editorNode->custom1 & CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT) != 0;
|
||||
BKE_image_user_frame_calc(imageuser, context.getFramenumber(), 0);
|
||||
BKE_image_user_frame_calc(imageuser, context.getFramenumber());
|
||||
/* force a load, we assume iuser index will be set OK anyway */
|
||||
if (image && image->type == IMA_TYPE_MULTILAYER) {
|
||||
bool is_multilayer_ok = false;
|
||||
|
|
|
@ -125,7 +125,7 @@ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf,
|
|||
/* the frame number, even if we cant */
|
||||
if (ima->source == IMA_SRC_SEQUENCE) {
|
||||
/* don't use iuser->framenr directly because it may not be updated if auto-refresh is off */
|
||||
const int framenr = BKE_image_user_frame_get(iuser, CFRA, 0, NULL);
|
||||
const int framenr = BKE_image_user_frame_get(iuser, CFRA, NULL);
|
||||
ofs += BLI_snprintf(str + ofs, len - ofs, IFACE_(", Frame: %d"), framenr);
|
||||
}
|
||||
}
|
||||
|
@ -863,7 +863,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
|
|||
ima = imaptr.data;
|
||||
iuser = userptr->data;
|
||||
|
||||
BKE_image_user_check_frame_calc(iuser, (int)scene->r.cfra, 0);
|
||||
BKE_image_user_check_frame_calc(iuser, (int)scene->r.cfra);
|
||||
|
||||
cb = MEM_callocN(sizeof(RNAUpdateCb), "RNAUpdateCb");
|
||||
cb->ptr = *ptr;
|
||||
|
|
|
@ -1495,7 +1495,7 @@ static int image_match_len_exec(bContext *C, wmOperator *UNUSED(op))
|
|||
if (!anim)
|
||||
return OPERATOR_CANCELLED;
|
||||
iuser->frames = IMB_anim_get_duration(anim, IMB_TC_RECORD_RUN);
|
||||
BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
|
||||
BKE_image_user_frame_calc(iuser, scene->r.cfra);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
|
|
@ -421,7 +421,7 @@ static void image_refresh(const bContext *C, ScrArea *sa)
|
|||
|
||||
ima = ED_space_image(sima);
|
||||
|
||||
BKE_image_user_check_frame_calc(&sima->iuser, scene->r.cfra, 0);
|
||||
BKE_image_user_check_frame_calc(&sima->iuser, scene->r.cfra);
|
||||
|
||||
/* check if we have to set the image from the editmesh */
|
||||
if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) {
|
||||
|
|
|
@ -658,7 +658,7 @@ static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr,
|
|||
/* Image *ima = imaptr->data; */ /* UNUSED */
|
||||
|
||||
char numstr[32];
|
||||
const int framenr = BKE_image_user_frame_get(iuser, CFRA, 0, NULL);
|
||||
const int framenr = BKE_image_user_frame_get(iuser, CFRA, NULL);
|
||||
BLI_snprintf(numstr, sizeof(numstr), IFACE_("Frame: %d"), framenr);
|
||||
uiItemL(layout, numstr, ICON_NONE);
|
||||
}
|
||||
|
|
|
@ -515,7 +515,7 @@ static void view3d_draw_bgpic(Scene *scene, Depsgraph *depsgraph,
|
|||
ima = bgpic->ima;
|
||||
if (ima == NULL)
|
||||
continue;
|
||||
BKE_image_user_frame_calc(&bgpic->iuser, (int)DEG_get_ctime(depsgraph), 0);
|
||||
BKE_image_user_frame_calc(&bgpic->iuser, (int)DEG_get_ctime(depsgraph));
|
||||
if (ima->source == IMA_SRC_SEQUENCE && !(bgpic->iuser.flag & IMA_USER_FRAME_IN_RANGE)) {
|
||||
ibuf = NULL; /* frame is out of range, dont show */
|
||||
}
|
||||
|
|
|
@ -143,7 +143,7 @@ static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *
|
|||
{
|
||||
ImageUser *iuser = ptr->data;
|
||||
|
||||
BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
|
||||
BKE_image_user_frame_calc(iuser, scene->r.cfra);
|
||||
|
||||
if (ptr->id.data) {
|
||||
/* Update material or texture for render preview. */
|
||||
|
|
|
@ -69,7 +69,7 @@ void MOD_init_texture(const Depsgraph *depsgraph, Tex *tex)
|
|||
return;
|
||||
|
||||
if (tex->ima && BKE_image_is_animated(tex->ima)) {
|
||||
BKE_image_user_frame_calc(&tex->iuser, DEG_get_ctime(depsgraph), 0);
|
||||
BKE_image_user_frame_calc(&tex->iuser, DEG_get_ctime(depsgraph));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue