[Bf-blender-cvs] [fae58962493] master: Fix T65059: Crash in empty scenes for context _bases functions

Dalai Felinto noreply at git.blender.org
Fri May 24 14:52:36 CEST 2019


Commit: fae58962493010f7c9c7d78f79e64165539f4317
Author: Dalai Felinto
Date:   Fri May 24 09:49:40 2019 -0300
Branches: master
https://developer.blender.org/rBfae58962493010f7c9c7d78f79e64165539f4317

Fix T65059: Crash in empty scenes for context _bases functions

Bug introduced on 0910932e71d2.

===================================================================

M	source/blender/blenkernel/intern/context.c

===================================================================

diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 9d753319cfa..28b0ae23ffe 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -404,11 +404,9 @@ static int ctx_data_base_collection_get(const bContext *C, const char *member, L
   ListBase ctx_object_list;
   bool ok = false;
 
-  if (!ctx_data_collection_get(C, member, &ctx_object_list)) {
-    return 0;
-  }
-
-  if (BLI_listbase_is_empty(&ctx_object_list)) {
+  if ((ctx_data_collection_get(C, member, &ctx_object_list) == false) ||
+      BLI_listbase_is_empty(&ctx_object_list)) {
+    BLI_listbase_clear(list);
     return 0;
   }



More information about the Bf-blender-cvs mailing list