[Bf-blender-cvs] [a9853a7e6ce] master: Fix missing NULL check in recent version patch

Campbell Barton noreply at git.blender.org
Fri Feb 8 02:12:15 CET 2019


Commit: a9853a7e6ce03c519310372232596970fdfdc9f2
Author: Campbell Barton
Date:   Fri Feb 8 12:06:55 2019 +1100
Branches: master
https://developer.blender.org/rBa9853a7e6ce03c519310372232596970fdfdc9f2

Fix missing NULL check in recent version patch

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

M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 554361ef813..5e0eb849341 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2808,7 +2808,9 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			}
 			ToolSettings *ts = scene->toolsettings;
 			ts->particle.flag &= ~PE_DEPRECATED_6;
-			ts->sculpt->flags &= ~SCULPT_FLAG_DEPRECATED_6;
+			if (ts->sculpt != NULL) {
+				ts->sculpt->flags &= ~SCULPT_FLAG_DEPRECATED_6;
+			}
 		}
 	}



More information about the Bf-blender-cvs mailing list