Page MenuHome
Differential D10234

Fix T85139: Force field texture missing depsgraph relation
ClosedPublic
Actions

Authored by Philipp Oeser (lichtwerk) on Jan 28 2021, 3:56 PM.

Details

Reviewers
Jacques Lucke (JacquesLucke)
Sergey Sharybin (sergey)
Maniphest Tasks
T75198: Can't get the image sequence to work together with force "Texture"
T85139: Changing texture field strength is sometimes needed to apply prior texture changes
Commits
rB3fb5e838677d: Fix T85139: Force field texture missing depsgraph relation
Summary

If a force field was of type "Texture", any changes of that texture (e.g.
its type - as reported in T85139 - or also its properties) were not
properly updating rigid bodies and particle systems.

Now ensure that texture is actually in the depsgraph and set up relation
accordingly.

Also fixes T75198.

Diff Detail

Repository
rB Blender

Event Timeline

Philipp Oeser (lichtwerk) requested review of this revision.Jan 28 2021, 3:56 PM
Philipp Oeser (lichtwerk) created this revision.
Harbormaster completed remote builds in B12440: Diff 33252.Jan 28 2021, 3:56 PM
Philipp Oeser (lichtwerk) added projects: Nodes & Physics, Dependency Graph.Jan 28 2021, 3:56 PM
Jacques Lucke (JacquesLucke) added a comment.Jan 28 2021, 4:19 PM

Besides the comment below, this looks good to me.

source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
654

Missing null check for object->pd. Same below.

Philipp Oeser (lichtwerk) planned changes to this revision.Jan 28 2021, 4:34 PM

missed one case, update incoming

Philipp Oeser (lichtwerk) updated this revision to Diff 33255.Jan 28 2021, 4:45 PM
  • missing NULL check
  • missed building texture for relations as well
Harbormaster completed remote builds in B12443: Diff 33255.Jan 28 2021, 4:45 PM
Jacques Lucke (JacquesLucke) added inline comments.Jan 28 2021, 4:49 PM
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
1740

This null check can be skipped, because it is done a few lines above.

Jacques Lucke (JacquesLucke) accepted this revision.Jan 28 2021, 5:06 PM
This revision is now accepted and ready to land.Jan 28 2021, 5:06 PM
Philipp Oeser (lichtwerk) updated this revision to Diff 33256.Jan 28 2021, 5:21 PM

remove redundant null check

Harbormaster completed remote builds in B12444: Diff 33256.Jan 28 2021, 5:21 PM
Philipp Oeser (lichtwerk) edited the summary of this revision. (Show Details)Jan 28 2021, 6:30 PM
Philipp Oeser (lichtwerk) added a task: T75198: Can't get the image sequence to work together with force "Texture".
Philipp Oeser (lichtwerk) marked 2 inline comments as done.Jan 28 2021, 6:39 PM
Sergey Sharybin (sergey) accepted this revision.Jan 29 2021, 9:34 AM
Closed by commit rB3fb5e838677d: Fix T85139: Force field texture missing depsgraph relation (authored by Philipp Oeser (lichtwerk)). · Explain WhyJan 29 2021, 10:20 AM
This revision was automatically updated to reflect the committed changes.
Philipp Oeser (lichtwerk) added a commit: rB3fb5e838677d: Fix T85139: Force field texture missing depsgraph relation.

Revision Contents
Changeset List

PathSize
source/
blender/
depsgraph/
intern/
builder/
5 lines
17 lines

Diff 33289

View Options

source/blender/depsgraph/intern/builder/deg_builder_nodes.cc

Loading...
View Options

source/blender/depsgraph/intern/builder/deg_builder_relations.cc

Loading...