[Bf-blender-cvs] [56b8adb9e24] master: Particles: avoid crash when connected unimplemented node
Jacques Lucke
noreply at git.blender.org
Thu Jul 16 16:43:52 CEST 2020
Commit: 56b8adb9e241a5a560592b25dc44b02c8790cff3
Author: Jacques Lucke
Date: Thu Jul 16 16:41:36 2020 +0200
Branches: master
https://developer.blender.org/rB56b8adb9e241a5a560592b25dc44b02c8790cff3
Particles: avoid crash when connected unimplemented node
===================================================================
M source/blender/blenkernel/intern/simulation.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc
index 7ba6e07fb64..831de084500 100644
--- a/source/blender/blenkernel/intern/simulation.cc
+++ b/source/blender/blenkernel/intern/simulation.cc
@@ -619,9 +619,12 @@ static const ParticleFunction *create_particle_function_for_inputs(
Vector<const ParticleFunctionInput *> per_particle_inputs;
for (const fn::MFOutputSocket *socket : dummy_deps) {
- StringRef attribute_name = attribute_inputs.lookup(socket);
+ const std::string *attribute_name = attribute_inputs.lookup_ptr(socket);
+ if (attribute_name == nullptr) {
+ return nullptr;
+ }
per_particle_inputs.append(&resources.construct<ParticleAttributeInput>(
- AT, attribute_name, socket->data_type().single_type()));
+ AT, *attribute_name, socket->data_type().single_type()));
}
const fn::MultiFunction &per_particle_fn = resources.construct<fn::MFNetworkEvaluator>(
More information about the Bf-blender-cvs
mailing list