[Bf-blender-cvs] [edf10951764] master: Fix T83275: Crash with scene statics and empty scene
Pablo Dobarro
noreply at git.blender.org
Tue Dec 1 10:27:55 CET 2020
Commit: edf109517648f149724a5fdc1797b3ce694b28c7
Author: Pablo Dobarro
Date: Tue Dec 1 10:24:17 2020 +0100
Branches: master
https://developer.blender.org/rBedf109517648f149724a5fdc1797b3ce694b28c7
Fix T83275: Crash with scene statics and empty scene
ob can be NULL, so it needs to be checked before accessing ob->mode
Differential Revision: https://developer.blender.org/D9680
===================================================================
M release/scripts/addons
M source/blender/editors/space_info/info_stats.c
M source/tools
===================================================================
diff --git a/release/scripts/addons b/release/scripts/addons
index 866dcad5aa6..ca741974401 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 866dcad5aa6e45737f0634b835adcbc0871201e5
+Subproject commit ca74197440127e56c9f6f2a277c30957f34fd07c
diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c
index 43d0d4fc425..71144fa11d0 100644
--- a/source/blender/editors/space_info/info_stats.c
+++ b/source/blender/editors/space_info/info_stats.c
@@ -405,7 +405,7 @@ static void stats_update(Depsgraph *depsgraph, ViewLayer *view_layer)
/* Pose Mode */
stats_object_pose(ob, &stats);
}
- else if (stats_is_object_dynamic_topology_sculpt(ob, ob->mode)) {
+ else if (ob && stats_is_object_dynamic_topology_sculpt(ob, ob->mode)) {
/* Dynamic topology. Do not count all vertices, dynamic topology stats are initialized later as
* part of sculpt stats. */
}
diff --git a/source/tools b/source/tools
index d7d7e9d41f7..7011d02c292 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit d7d7e9d41f7499aa4639f96c843156ff834385ba
+Subproject commit 7011d02c292ac1c91a5c9cc1a075ea2727982cee
More information about the Bf-blender-cvs
mailing list