griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix null pointer de-reference in rna_Particle_Material_itemf

Browse Source 
Correct error in [0], also break out of the loop once the
object is found.

[0]: 140c0f1db9
This commit is contained in:
Campbell Barton
2024-10-17 11:53:46 +11:00
parent 9222ce24f5
commit 8752413171
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/makesrna/intern/rna_particle.cc
View File

@@ -488,22 +488,26 @@ static const EnumPropertyItem *rna_Particle_Material_itemf(bContext *C,
/* The context object might not be what we want when doing this from python. */
Object *ob_found = nullptr;
Object *ob_context = static_cast<Object *>(CTX_data_pointer_get(C, "object").data);
LISTBASE_FOREACH (ParticleSystem *, psys, &ob_context->particlesystem) {
if (psys->part == part) {
ob_found = ob_context;
if (Object *ob_context = static_cast<Object *>(CTX_data_pointer_get(C, "object").data)) {
LISTBASE_FOREACH (ParticleSystem *, psys, &ob_context->particlesystem) {
if (psys->part == part) {
ob_found = ob_context;
break;
}
}
}
if (ob_found == nullptr) {
/* Iterating over all object is slow, but no better solution exists at the moment. */
for (Object *ob = static_cast<Object *>(CTX_data_main(C)->objects.first); ob;
for (Object *ob = static_cast<Object *>(CTX_data_main(C)->objects.first);
ob && (ob_found == nullptr);
ob = static_cast<Object *>(ob->id.next))
{
LISTBASE_FOREACH (ParticleSystem *, psys, &ob->particlesystem) {
if (psys->part == part) {
ob_found = ob;
break;
}
}
}