diff options
| author | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
| commit | bfbf0bb7f7a0191b65fc724d5dfea225e6293c6b (patch) | |
| tree | 042f37d28c9e1cf0ce5a0fb4fd4235288f62d36e /source/blender/blenloader/intern/readfile.c | |
| parent | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (diff) | |
| parent | 78017916f7c7a8ec8907c9b993214ff8ec3c3557 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-reviewtemp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index db63091ce36..c9027eae296 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6984,7 +6984,6 @@ static void direct_link_scene(FileData *fd, Scene *sce) direct_link_paint(fd, sce, &sce->toolsettings->imapaint.paint); - sce->toolsettings->imapaint.paintcursor = NULL; sce->toolsettings->particle.paintcursor = NULL; sce->toolsettings->particle.scene = NULL; sce->toolsettings->particle.object = NULL; |