From 1cc4ab481e87c0e3f459302bffbdf029545fd42d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 18 May 2018 14:23:53 +0200 Subject: Fix crash drawing polygon curves --- source/blender/editors/curve/editcurve_paint.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index 0d7cb089c4f..36d9f8a4c55 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -978,9 +978,16 @@ static int curve_draw_exec(bContext *C, wmOperator *op) const struct StrokeElem *selem; nu->pntsu = stroke_len; + nu->pntsv = 1; nu->type = CU_POLY; nu->bp = MEM_callocN(nu->pntsu * sizeof(BPoint), __func__); + /* Misc settings. */ + nu->resolu = cu->resolu; + nu->resolv = 1; + nu->orderu = 4; + nu->orderv = 1; + BPoint *bp = nu->bp; BLI_mempool_iternew(cdd->stroke_elem_pool, &iter); -- cgit v1.2.3 From 5e7a21a5f549f5db73385820cafcd8f2bb9c91da Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Fri, 18 May 2018 12:58:46 +0200 Subject: Fix T55115: crash when iterating SmokeDomainSettings color_grid property through python --- source/blender/makesrna/intern/rna_smoke.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 38c297def32..b860ad303f0 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -286,20 +286,27 @@ static void rna_SmokeModifier_color_grid_get(PointerRNA *ptr, float *values) { #ifdef WITH_SMOKE SmokeDomainSettings *sds = (SmokeDomainSettings *)ptr->data; + int length[RNA_MAX_ARRAY_DIMENSION]; + int size = rna_SmokeModifier_grid_get_length(ptr, length); BLI_rw_mutex_lock(sds->fluid_mutex, THREAD_LOCK_READ); - if (sds->flags & MOD_SMOKE_HIGHRES) { - if (smoke_turbulence_has_colors(sds->wt)) - smoke_turbulence_get_rgba(sds->wt, values, 0); - else - smoke_turbulence_get_rgba_from_density(sds->wt, sds->active_color, values, 0); + if (!sds->fluid) { + memset(values, 0, size * sizeof(float)); } else { - if (smoke_has_colors(sds->fluid)) - smoke_get_rgba(sds->fluid, values, 0); - else - smoke_get_rgba_from_density(sds->fluid, sds->active_color, values, 0); + if (sds->flags & MOD_SMOKE_HIGHRES) { + if (smoke_turbulence_has_colors(sds->wt)) + smoke_turbulence_get_rgba(sds->wt, values, 0); + else + smoke_turbulence_get_rgba_from_density(sds->wt, sds->active_color, values, 0); + } + else { + if (smoke_has_colors(sds->fluid)) + smoke_get_rgba(sds->fluid, values, 0); + else + smoke_get_rgba_from_density(sds->fluid, sds->active_color, values, 0); + } } BLI_rw_mutex_unlock(sds->fluid_mutex); -- cgit v1.2.3