Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-04-10 18:11:45 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-04-10 18:11:45 +0400
commit5eca59cf0d05fd8063eb83ad80b2caf9c5eacedc (patch)
treeebd47eec797e9dd6e93217054a37b0ce6541ddb6 /source/blender/modifiers/intern/MOD_weightvg_util.c
parent8adc27688597baf212adcab841b42e3e07bcb0bc (diff)
Fix #30882: using an image sequence in the displace modifier did not update
properly in animation rendering.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvg_util.c')
-rw-r--r--source/blender/modifiers/intern/MOD_weightvg_util.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c
index 47a2aeaf4a2..fad83286d8e 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@@ -38,6 +38,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_colortools.h" /* CurveMapping. */
@@ -113,7 +114,7 @@ void weightvg_do_map(int num, float *new_w, short falloff_type, CurveMapping *cm
*/
void weightvg_do_mask(int num, const int *indices, float *org_w, const float *new_w,
Object *ob, DerivedMesh *dm, float fact, const char defgrp_name[MAX_VGROUP_NAME],
- Tex *texture, int tex_use_channel, int tex_mapping,
+ Scene *scene, Tex *texture, int tex_use_channel, int tex_mapping,
Object *tex_map_object, const char *tex_uvlayer_name)
{
int ref_didx;
@@ -145,6 +146,8 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne
get_texture_coords(&t_map, ob, dm, v_co, tex_co, num);
MEM_freeN(v_co);
+ modifier_init_texture(scene, texture);
+
/* For each weight (vertex), make the mix between org and new weights. */
for (i = 0; i < num; ++i) {
int idx = indices ? indices[i] : i;