Merge branch 'master' into property-search-button-label-pointer

2 files changed, 11 insertions, 0 deletions

diff --git a/source/blender/draw/intern/draw_fluid.c b/source/blender/draw/intern/draw_fluid.c
index af14f11e6e9..809512bd7dd 100644
--- a/source/blender/draw/intern/draw_fluid.c
+++ b/source/blender/draw/intern/draw_fluid.c
@@ -183,6 +183,10 @@ static GPUTexture *create_volume_texture(const int dim[3],
   GPUTexture *tex = NULL;
   int final_dim[3] = {UNPACK3(dim)};
 
+  if (data == NULL) {
+    return NULL;
+  }
+
   while (1) {
     tex = GPU_texture_create_3d("volume", UNPACK3(final_dim), 1, format, NULL);
 
@@ -292,6 +296,10 @@ static GPUTexture *create_density_texture(FluidDomainSettings *fds, int highres)
     data = manta_smoke_get_density(fds->fluid);
   }
 
+  if (data == NULL) {
+    return NULL;
+  }
+
   GPUTexture *tex = create_volume_texture(dim, GPU_R8, data);
   swizzle_texture_channel_single(tex);
   return tex;
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index 7ad54a56545..06ab60d992c 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -1296,6 +1296,9 @@ void mesh_customdatacorrect_init(TransInfo *t)
       use_merge_group = (t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT_KEEP_CONNECTED) != 0;
     }
   }
+  else {
+    return;
+  }
 
   FOREACH_TRANS_DATA_CONTAINER (t, tc) {
     mesh_customdatacorrect_init_container(tc, use_merge_group);