diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvg_util.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvg_util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index eed0c41e374..60537e51e22 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -47,6 +47,7 @@ #include "BKE_texture.h" /* Texture masking. */ #include "DEG_depsgraph.h" +#include "DEG_depsgraph_query.h" #include "MEM_guardedalloc.h" #include "MOD_util.h" @@ -124,7 +125,6 @@ void weightvg_do_mask( Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping, Object *tex_map_object, const char *tex_uvlayer_name) { - Depsgraph *depsgraph = ctx->depsgraph; int ref_didx; int i; @@ -132,7 +132,8 @@ void weightvg_do_mask( if (fact == 0.0f) return; /* If we want to mask vgroup weights from a texture. */ - if (texture) { + if (texture != NULL) { + texture = (Tex *)DEG_get_evaluated_id(ctx->depsgraph, &texture->id); /* The texture coordinates. */ float (*tex_co)[3]; /* See mapping note below... */ @@ -150,9 +151,9 @@ void weightvg_do_mask( t_map.texmapping = tex_mapping; tex_co = MEM_calloc_arrayN(numVerts, sizeof(*tex_co), "WeightVG Modifier, TEX mode, tex_co"); - MOD_get_texture_coords(&t_map, ob, mesh, NULL, tex_co); + MOD_get_texture_coords(&t_map, ctx, ob, mesh, NULL, tex_co); - MOD_init_texture(depsgraph, texture); + MOD_init_texture(&t_map, ctx); /* For each weight (vertex), make the mix between org and new weights. */ for (i = 0; i < num; ++i) { |