diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 5 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 1d5840765bc..12aef5f4b29 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -1379,7 +1379,10 @@ void BKE_free_pointdensitydata(PointDensity *pd) MEM_freeN(pd->point_data); pd->point_data = NULL; } - if(pd->coba) MEM_freeN(pd->coba); + if(pd->coba) { + MEM_freeN(pd->coba); + pd->coba = NULL; + } } void BKE_free_pointdensity(PointDensity *pd) diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index dc0f083094c..7ccf81b7755 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -68,10 +68,12 @@ static int point_data_used(PointDensity *pd) { int pd_bitflag = 0; - if ((pd->noise_influence == TEX_PD_NOISE_VEL) || (pd->color_source == TEX_PD_COLOR_PARTVEL) || (pd->color_source == TEX_PD_COLOR_PARTSPEED)) - pd_bitflag |= POINT_DATA_VEL; - if ((pd->noise_influence == TEX_PD_NOISE_AGE) || (pd->color_source == TEX_PD_COLOR_PARTAGE)) - pd_bitflag |= POINT_DATA_LIFE; + if (pd->source == TEX_PD_PSYS) { + if ((pd->noise_influence == TEX_PD_NOISE_VEL) || (pd->color_source == TEX_PD_COLOR_PARTVEL) || (pd->color_source == TEX_PD_COLOR_PARTSPEED)) + pd_bitflag |= POINT_DATA_VEL; + if ((pd->noise_influence == TEX_PD_NOISE_AGE) || (pd->color_source == TEX_PD_COLOR_PARTAGE)) + pd_bitflag |= POINT_DATA_LIFE; + } return pd_bitflag; } |