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:
authorSergey Sharybin <sergey@blender.org>2021-01-27 16:20:31 +0300
committerSergey Sharybin <sergey@blender.org>2021-01-27 16:20:31 +0300
commitcd24712c2c51ab753369f7cae8c43c38115bd59f (patch)
tree34c10030e3da5d64a82e02061043d6ece10578d8 /source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
parentea01c8c5f6ce5bf7df1af13795155f2dec473e0a (diff)
Fix T84717: Missing viewport update after shading changes
Revert "Fix T83411: Crash when using a workspace/layout data path in a driver" The fix for the crash exposed design violation in the viewport shading updates, which is for some reason relying on dependency graph tag of interface data. The viewport module did not respond to the issue in 2 weeks, and the architect considered missing update for multiple users a more serious issue than a crash in a very specific case. This reverts commit 0f95f51361d73fbd8ba8d80b3b65da930dcf3b20.
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.cc')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc36
1 files changed, 4 insertions, 32 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 39dc4b32ca1..a109c5d8d88 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -387,9 +387,7 @@ void DepsgraphNodeBuilder::build_id(ID *id)
if (id == nullptr) {
return;
}
-
- const ID_Type id_type = GS(id->name);
- switch (id_type) {
+ switch (GS(id->name)) {
case ID_AC:
build_action((bAction *)id);
break;
@@ -479,39 +477,13 @@ void DepsgraphNodeBuilder::build_id(ID *id)
case ID_SIM:
build_simulation((Simulation *)id);
break;
- case ID_PA:
- build_particle_settings((ParticleSettings *)id);
- break;
- case ID_GD:
- build_gpencil((bGPdata *)id);
- break;
-
- case ID_LI:
- case ID_IP:
- case ID_SCR:
- case ID_VF:
- case ID_BR:
- case ID_WM:
- case ID_PAL:
- case ID_PC:
- case ID_WS:
- BLI_assert(!deg_copy_on_write_is_needed(id_type));
- build_generic_id(id);
+ default:
+ fprintf(stderr, "Unhandled ID %s\n", id->name);
+ BLI_assert(!"Should never happen");
break;
}
}
-void DepsgraphNodeBuilder::build_generic_id(ID *id)
-{
- if (built_map_.checkIsBuiltAndTag(id)) {
- return;
- }
-
- build_idproperties(id->properties);
- build_animdata(id);
- build_parameters(id);
-}
-
static void build_idproperties_callback(IDProperty *id_property, void *user_data)
{
DepsgraphNodeBuilder *builder = reinterpret_cast<DepsgraphNodeBuilder *>(user_data);