[Bf-blender-cvs] [559fff160ec] blender2.8: Debug: Assert to ensure layer iterator uses a 3D view

Campbell Barton noreply at git.blender.org
Thu Nov 29 04:36:20 CET 2018


Commit: 559fff160ecd23e636769e1f79fa5fbfdedcd3b1
Author: Campbell Barton
Date:   Thu Nov 29 14:34:48 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB559fff160ecd23e636769e1f79fa5fbfdedcd3b1

Debug: Assert to ensure layer iterator uses a 3D view

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

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

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 9931c29a8c2..f525893a854 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -45,6 +45,7 @@
 #include "BKE_object.h"
 
 #include "DNA_ID.h"
+#include "DNA_space_types.h"
 #include "DNA_collection_types.h"
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"
@@ -1104,6 +1105,7 @@ typedef struct LayerObjectBaseIteratorData {
 static bool object_bases_iterator_is_valid_ex(View3D *v3d, Base *base, const int flag)
 {
 	if (v3d != NULL) {
+		BLI_assert(v3d->spacetype == SPACE_VIEW3D);
 		if ((v3d->object_type_exclude_viewport & (1 << base->object->type)) != 0) {
 			return false;
 		}



More information about the Bf-blender-cvs mailing list