diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
| commit | b076b3853c99d947806e05fe2dec29ca5fa944fa (patch) | |
| tree | 3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/makesrna/intern/rna_modifier.c | |
| parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
| parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 48ebc02cee0..f0001852da2 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1152,7 +1152,7 @@ static void rna_MeshSequenceCache_object_path_update(Main *bmain, Scene *scene, rna_Modifier_update(bmain, scene, ptr); } -static int rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, const PointerRNA value) +static bool rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, const PointerRNA value) { ParticleInstanceModifierData *psmd = ptr->data; ParticleSystem *psys = value.data; @@ -1161,7 +1161,7 @@ static int rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, co return false; /* make sure psys is in the object */ - return BLI_findindex(&psmd->ob->particlesystem, psys) >= 0; + return BLI_findindex(&psmd->ob->particlesystem, psys) != -1; } static PointerRNA rna_ParticleInstanceModifier_particle_system_get(PointerRNA *ptr) |