diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 14:37:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 14:37:51 +0300 |
| commit | c6ca842e234024b0276e5b294455ed2dbbe998e0 (patch) | |
| tree | e1c3fb393507c0fe4092e3e133f3ddaec239463e /source/blender/draw/engines/workbench/workbench_private.h | |
| parent | d8f1b18d9b7494070715dd7a74e0c7753a43a3aa (diff) | |
Fix T61937: image sequences not updating in workbench display mode.
Need to pass the image user along to get the frame number.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_private.h')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_private.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index da6df4c93bd..115868bc268 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -278,6 +278,7 @@ typedef struct WORKBENCH_MaterialData { int color_type; int interp; Image *ima; + ImageUser *iuser; /* Linked shgroup for drawing */ DRWShadingGroup *shgrp; @@ -322,7 +323,7 @@ void workbench_forward_cache_finish(WORKBENCH_Data *vedata); void workbench_forward_outline_shaders_ensure(WORKBENCH_PrivateData *wpd); void workbench_forward_choose_shaders(WORKBENCH_PrivateData *wpd); WORKBENCH_MaterialData *workbench_forward_get_or_create_material_data( - WORKBENCH_Data *vedata, Object *ob, Material *mat, Image *ima, int color_type, int interp); + WORKBENCH_Data *vedata, Object *ob, Material *mat, Image *ima, ImageUser *iuser, int color_type, int interp); /* workbench_effect_aa.c */ void workbench_aa_create_pass(WORKBENCH_Data *vedata, GPUTexture **tx); @@ -350,7 +351,7 @@ void workbench_dof_draw_pass(WORKBENCH_Data *vedata); /* workbench_materials.c */ int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *ima, Object *ob); -void workbench_material_get_image_and_mat(Object *ob, int mat_nr, Image **r_image, int *r_interp, Material **r_mat); +void workbench_material_get_image_and_mat(Object *ob, int mat_nr, Image **r_image, ImageUser **r_iuser, int *r_interp, Material **r_mat); char *workbench_material_build_defines(WORKBENCH_PrivateData *wpd, bool use_textures, bool is_hair); void workbench_material_update_data(WORKBENCH_PrivateData *wpd, Object *ob, Material *mat, WORKBENCH_MaterialData *data); uint workbench_material_get_hash(WORKBENCH_MaterialData *material_template, bool is_ghost); |