From c961bf8975ef75ec3928b76c95584ca1c1151c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 5 Aug 2020 14:17:14 +0200 Subject: GPUTexture: Fix missing break --- source/blender/gpu/intern/gpu_texture.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender') diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 112fcb8f801..1e81f6e86a4 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -740,6 +740,7 @@ static bool gpu_texture_check_capacity( case GL_PROXY_TEXTURE_3D: glTexImage3D( proxy, 0, internalformat, tex->w, tex->h, tex->d, 0, data_format, data_type, NULL); + break; case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB: glTexImage3D( proxy, 0, internalformat, tex->w, tex->h, tex->d * 6, 0, data_format, data_type, NULL); -- cgit v1.2.3 From 56d7e39b92997768b3db8ce2dbc262f869994145 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 5 Aug 2020 15:36:24 +0200 Subject: Fix T79520: Data Transfer modifier: crash/assert going into editmode on a source object. --- source/blender/blenkernel/intern/data_transfer.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 9bdd80fd668..7bf87d0e639 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -43,6 +43,7 @@ #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" #include "BKE_mesh_runtime.h" +#include "BKE_mesh_wrapper.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_object_deform.h" @@ -1467,6 +1468,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, if (!me_src) { return changed; } + BKE_mesh_wrapper_ensure_mdata(me_src); if (auto_transform) { if (space_transform == NULL) { -- cgit v1.2.3