archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix modifiers not using depsgraph time for texture evaluation.

Browse Source 
Texture animation seems to be broken anyway currently, but at leat
modifier side it should now be OK.
This commit is contained in:
Bastien Montagne
2018-05-23 15:52:35 +02:00
parent a455e35343
commit 4a2213dc9a
10 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/modifiers/intern/MOD_displace.c
View File

@@ -52,6 +52,8 @@
#include "BKE_deform.h"
#include "BKE_object.h"
#include "DEG_depsgraph.h"
#include "MEM_guardedalloc.h"
#include "MOD_util.h"
@@ -271,9 +273,11 @@ static void displaceModifier_do_task(
/* dm must be a CDDerivedMesh */
static void displaceModifier_do(
DisplaceModifierData *dmd, Object *ob,
DisplaceModifierData *dmd, const ModifierEvalContext *ctx,
Mesh *mesh, float (*vertexCos)[3], const int numVerts)
{
Object *ob = ctx->object;
Depsgraph *depsgraph = ctx->depsgraph;
MVert *mvert;
MDeformVert *dvert;
int direction = dmd->direction;
@@ -295,7 +299,7 @@ static void displaceModifier_do(
"displaceModifier_do tex_co");
get_texture_coords_mesh((MappingInfoModifierData *)dmd, ob, mesh, vertexCos, tex_co);
modifier_init_texture(dmd->modifier.scene, dmd->texture);
modifier_init_texture(depsgraph, dmd->texture);
}
else {
tex_co = NULL;
@@ -374,8 +378,7 @@ static void deformVerts(
BLI_assert(mesh_src->totvert == numVerts);
displaceModifier_do((DisplaceModifierData *)md, ctx->object, mesh_src,
vertexCos, numVerts);
displaceModifier_do((DisplaceModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
if (mesh_src != mesh) {
BKE_id_free(NULL, mesh_src);
@@ -390,7 +393,7 @@ static void deformVertsEM(
BLI_assert(mesh_src->totvert == numVerts);
displaceModifier_do((DisplaceModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts);
displaceModifier_do((DisplaceModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
if (mesh_src != mesh) {
BKE_id_free(NULL, mesh_src);

7
source/blender/modifiers/intern/MOD_util.c
View File

@@ -53,6 +53,9 @@
#include "BKE_modifier.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
#include "MOD_util.h"
#include "MOD_modifiertypes.h"
@@ -60,13 +63,13 @@
#include "bmesh.h"
void modifier_init_texture(const Scene *scene, Tex *tex)
void modifier_init_texture(const Depsgraph *depsgraph, Tex *tex)
{
if (!tex)
return;
if (tex->ima && BKE_image_is_animated(tex->ima)) {
BKE_image_user_frame_calc(&tex->iuser, scene->r.cfra, 0);
BKE_image_user_frame_calc(&tex->iuser, DEG_get_ctime(depsgraph), 0);
}
}

3
source/blender/modifiers/intern/MOD_util.h
View File

@@ -34,6 +34,7 @@
#include "DEG_depsgraph_build.h"
struct DerivedMesh;
struct Depsgraph;
struct MDeformVert;
struct Mesh;
struct ModifierData;
@@ -41,7 +42,7 @@ struct Object;
struct Scene;
struct Tex;
void modifier_init_texture(const struct Scene *scene, struct Tex *texture);
void modifier_init_texture(const struct Depsgraph *depsgraph, struct Tex *texture);
void get_texture_coords(
struct MappingInfoModifierData *dmd, struct Object *ob, struct DerivedMesh *dm,
float (*co)[3], float (*texco)[3], int numVerts);

12
source/blender/modifiers/intern/MOD_warp.c
View File

@@ -45,6 +45,8 @@
#include "BKE_texture.h"
#include "BKE_colortools.h"
#include "DEG_depsgraph.h"
#include "RE_shader_ext.h"
#include "MOD_util.h"
@@ -149,9 +151,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
}
static void warpModifier_do(
WarpModifierData *wmd, Object *ob,
WarpModifierData *wmd, const ModifierEvalContext *ctx,
Mesh *mesh, float (*vertexCos)[3], int numVerts)
{
Object *ob = ctx->object;
Depsgraph *depsgraph = ctx->depsgraph;
float obinv[4][4];
float mat_from[4][4];
float mat_from_inv[4][4];
@@ -213,7 +217,7 @@ static void warpModifier_do(
tex_co = MEM_malloc_arrayN(numVerts, sizeof(*tex_co), "warpModifier_do tex_co");
get_texture_coords_mesh((MappingInfoModifierData *)wmd, ob, mesh, vertexCos, tex_co);
modifier_init_texture(wmd->modifier.scene, wmd->texture);
modifier_init_texture(depsgraph, wmd->texture);
}
for (i = 0; i < numVerts; i++) {
@@ -316,7 +320,7 @@ static void deformVerts(
BLI_assert(mesh_src->totvert == numVerts);
warpModifier_do((WarpModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts);
warpModifier_do((WarpModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
}
static void deformVertsEM(
@@ -331,7 +335,7 @@ static void deformVertsEM(
BLI_assert(mesh_src->totvert == numVerts);
warpModifier_do((WarpModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts);
warpModifier_do((WarpModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
if (!mesh) {
BKE_id_free(NULL, mesh_src);

2
source/blender/modifiers/intern/MOD_wave.c
View File

@@ -194,7 +194,7 @@ static void waveModifier_do(
"waveModifier_do tex_co");
get_texture_coords_mesh((MappingInfoModifierData *)wmd, ob, mesh, vertexCos, tex_co);
modifier_init_texture(wmd->modifier.scene, wmd->texture);
modifier_init_texture(depsgraph, wmd->texture);
}
if (lifefac != 0.0f) {

6
source/blender/modifiers/intern/MOD_weightvg_util.c
View File

@@ -46,6 +46,8 @@
#include "BKE_modifier.h"
#include "BKE_texture.h" /* Texture masking. */
#include "DEG_depsgraph.h"
#include "MEM_guardedalloc.h"
#include "MOD_util.h"
#include "MOD_weightvg_util.h"
@@ -116,11 +118,13 @@ void weightvg_do_map(int num, float *new_w, short falloff_type, CurveMapping *cm
* XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear.
*/
void weightvg_do_mask(
const ModifierEvalContext *ctx,
const int num, const int *indices, float *org_w, const float *new_w,
Object *ob, Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME],
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;
@@ -148,7 +152,7 @@ void weightvg_do_mask(
tex_co = MEM_calloc_arrayN(numVerts, sizeof(*tex_co), "WeightVG Modifier, TEX mode, tex_co");
get_texture_coords_mesh(&t_map, ob, mesh, NULL, tex_co);
modifier_init_texture(scene, texture);
modifier_init_texture(depsgraph, texture);
/* For each weight (vertex), make the mix between org and new weights. */
for (i = 0; i < num; ++i) {

2
source/blender/modifiers/intern/MOD_weightvg_util.h
View File

@@ -35,6 +35,7 @@ struct CurveMapping;
struct MDeformVert;
struct MDeformWeight;
struct Mesh;
struct ModifierEvalContext;
struct Object;
struct Tex;
struct Scene;
@@ -73,6 +74,7 @@ void weightvg_do_map(int num, float *new_w, short mode, struct CurveMapping *cma
* XXX The standard "factor" value is assumed in [0.0, 1.0] range. Else, weird results might appear.
*/
void weightvg_do_mask(
const ModifierEvalContext *ctx,
const int num, const int *indices, float *org_w, const float *new_w, Object *ob,
struct Mesh *mesh, const float fact, const char defgrp_name[MAX_VGROUP_NAME],
struct Scene *scene, Tex *texture, const int tex_use_channel, const int tex_mapping,

2
source/blender/modifiers/intern/MOD_weightvgedit.c
View File

@@ -254,7 +254,7 @@ static Mesh *applyModifier(
}
/* Do masking. */
weightvg_do_mask(numVerts, NULL, org_w, new_w, ctx->object, result, wmd->mask_constant,
weightvg_do_mask(ctx, numVerts, NULL, org_w, new_w, ctx->object, result, wmd->mask_constant,
wmd->mask_defgrp_name, wmd->modifier.scene, wmd->mask_texture,
wmd->mask_tex_use_channel, wmd->mask_tex_mapping,
wmd->mask_tex_map_obj, wmd->mask_tex_uvlayer_name);

2
source/blender/modifiers/intern/MOD_weightvgmix.c
View File

@@ -366,7 +366,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
}
/* Do masking. */
weightvg_do_mask(numIdx, indices, org_w, new_w, ctx->object, result, wmd->mask_constant,
weightvg_do_mask(ctx, numIdx, indices, org_w, new_w, ctx->object, result, wmd->mask_constant,
wmd->mask_defgrp_name, wmd->modifier.scene, wmd->mask_texture,
wmd->mask_tex_use_channel, wmd->mask_tex_mapping,
wmd->mask_tex_map_obj, wmd->mask_tex_uvlayer_name);

2
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@@ -544,7 +544,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
do_map(ob, new_w, numIdx, wmd->min_dist, wmd->max_dist, wmd->falloff_type);
/* Do masking. */
weightvg_do_mask(numIdx, indices, org_w, new_w, ob, result, wmd->mask_constant,
weightvg_do_mask(ctx, numIdx, indices, org_w, new_w, ob, result, wmd->mask_constant,
wmd->mask_defgrp_name, wmd->modifier.scene, wmd->mask_texture,
wmd->mask_tex_use_channel, wmd->mask_tex_mapping,
wmd->mask_tex_map_obj, wmd->mask_tex_uvlayer_name);