Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenloader/intern/readfile.c1
-rw-r--r--source/blender/editors/render/render_internal.c13
-rw-r--r--source/blender/makesdna/DNA_scene_types.h2
3 files changed, 1 insertions, 15 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d08dce5a144..e6a4d872986 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6244,7 +6244,6 @@ static void direct_link_scene(FileData *fd, Scene *sce)
sce->depsgraph_hash = NULL;
sce->fps_info = NULL;
sce->customdata_mask_modal = 0;
- sce->lay_updated = 0;
BKE_sound_create_scene(sce);
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index d6a968d993c..9632eec5420 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -734,24 +734,11 @@ static void render_endjob(void *rjv)
/* Finally unlock the user interface (if it was locked). */
if (rj->interface_locked) {
- Scene *scene;
-
/* Interface was locked, so window manager couldn't have been changed
* and using one from Global will unlock exactly the same manager as
* was locked before running the job.
*/
WM_set_locked_interface(G_MAIN->wm.first, false);
-
- /* We've freed all the derived caches before rendering, which is
- * effectively the same as if we re-loaded the file.
- *
- * So let's not try being smart here and just reset all updated
- * scene layers and use generic DAG_on_visible_update.
- */
- for (scene = G_MAIN->scene.first; scene; scene = scene->id.next) {
- scene->lay_updated = 0;
- }
-
DEG_on_visible_update(G_MAIN, false);
}
}
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 397c0e966cc..63a6a191b9e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1490,7 +1490,7 @@ typedef struct Scene {
unsigned int lay; /* bitflags for layer visibility */
int layact; /* active layer */
- unsigned int lay_updated; /* runtime flag, has layer ever been updated since load? */
+ unsigned int pad1;
short flag; /* various settings */