diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-07-31 14:47:46 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-07-31 14:47:46 +0300 |
commit | 3785dc59d10025dbbfcc5192abda64d530a143ea (patch) | |
tree | 5f74f45ae2c87a075b2ddca0e267a2c5b002dc9a /source | |
parent | ded4b7200260b93c506f16eed8b6ea92cab5622a (diff) | |
parent | feaed44ef6435c0cc9d5c539b9945a5f6455de80 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_curve.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_texture.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c index 66e9e2184c1..a7adbed6c4b 100644 --- a/source/blender/blenkernel/intern/gpencil_curve.c +++ b/source/blender/blenkernel/intern/gpencil_curve.c @@ -363,7 +363,7 @@ static void gpencil_convert_spline(Main *bmain, BKE_nurb_makeCurve(nu, coord_array, NULL, NULL, NULL, resolu, sizeof(float[3])); /* Allocate memory for storage points. */ - gps->totpoints = nurb_points - 1; + gps->totpoints = nurb_points; gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points"); /* Add points. */ diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc index 8a3a8a382f8..014f82f83de 100644 --- a/source/blender/gpu/intern/gpu_texture.cc +++ b/source/blender/gpu/intern/gpu_texture.cc @@ -2177,7 +2177,7 @@ void GPU_samplers_init(void) glGenSamplers(1, &GG.icon_sampler); glSamplerParameteri(GG.icon_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); glSamplerParameteri(GG.icon_sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glSamplerParameteri(GG.icon_sampler, GL_TEXTURE_LOD_BIAS, -0.5f); + glSamplerParameterf(GG.icon_sampler, GL_TEXTURE_LOD_BIAS, -0.5f); } void GPU_sampler_icon_bind(int unit) |