Commit: 1cdfb9ad5a9736abf0322e2d00d0d4d47dc8c7db Author: Hans Goudey Date: Tue Jul 6 13:29:39 2021 -0500 Branches: curve-nodes-modifier https://developer.blender.org/rB1cdfb9ad5a9736abf0322e2d00d0d4d47dc8c7db
Cleanup: Remove unecessary change =================================================================== M source/blender/draw/intern/draw_cache_impl_curve.cc =================================================================== diff --git a/source/blender/draw/intern/draw_cache_impl_curve.cc b/source/blender/draw/intern/draw_cache_impl_curve.cc index b7f5f79291f..51bd4c535cd 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.cc +++ b/source/blender/draw/intern/draw_cache_impl_curve.cc @@ -245,7 +245,9 @@ enum { /* * ob_curve_cache can be NULL, only needed for CU_DATATYPE_WIRE */ -static CurveRenderData *curve_render_data_create(Curve *cu, Object *ob, const int types) +static CurveRenderData *curve_render_data_create(Curve *cu, + CurveCache *ob_curve_cache, + const int types) { CurveRenderData *rdata = (CurveRenderData *)MEM_callocN(sizeof(*rdata), __func__); rdata->types = types; @@ -254,7 +256,7 @@ static CurveRenderData *curve_render_data_create(Curve *cu, Object *ob, const in rdata->actnu = cu->actnu; rdata->actvert = cu->actvert; - rdata->ob_curve_cache = ob->runtime.curve_cache; + rdata->ob_curve_cache = ob_curve_cache; rdata->curve_eval = cu->curve_eval; @@ -1146,7 +1148,7 @@ void DRW_curve_batch_cache_create_requested(Object *ob, const struct Scene *scen printf(" mr_flag %d\n\n", mr_flag); #endif - CurveRenderData *rdata = curve_render_data_create(cu, ob, mr_flag); + CurveRenderData *rdata = curve_render_data_create(cu, ob->runtime.curve_cache, mr_flag); /* The object's curve cache can be empty (in one case because we use #CurveEval's cache instead), * If so, point to an empty DispList list to avoid the need to check for null in the following _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs