[Bf-blender-cvs] [113a70808c2] blender2.8: Fix T57854: Disable viewport visibility crash

Sergey Sharybin noreply at git.blender.org
Thu Nov 15 18:29:12 CET 2018


Commit: 113a70808c217e432719531571f7f07952e3d341
Author: Sergey Sharybin
Date:   Thu Nov 15 18:28:43 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB113a70808c217e432719531571f7f07952e3d341

Fix T57854: Disable viewport visibility crash

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

M	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc

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

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 0c50ce6b82a..a86ea02d5e7 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -375,6 +375,9 @@ void view_layer_remove_invisible_bases(const Depsgraph *depsgraph,
 			BLI_addtail(&visible_bases, base);
 		}
 		else {
+			if (base == view_layer->basact) {
+				view_layer->basact = NULL;
+			}
 			MEM_freeN(base);
 		}
 	}



More information about the Bf-blender-cvs mailing list