[Bf-blender-cvs] [aa18c4c] master: Clear object recalc flag on load

Tom Edwards noreply at git.blender.org
Mon Jan 20 13:39:37 CET 2014


Commit: aa18c4c445cbe7e5cbf0b766a42cfc9e4b764002
Author: Tom Edwards
Date:   Mon Jan 20 18:36:00 2014 +0600
https://developer.blender.org/rBaa18c4c445cbe7e5cbf0b766a42cfc9e4b764002

Clear object recalc flag on load

It is possible that object in .blend file will have non-zero
recalc flags. Clear them on load in order to prevent possible
unneeded recalc after the load.

Differential Revision: https://developer.blender.org/D224

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a63d702..88e7f85 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4829,6 +4829,11 @@ static void direct_link_object(FileData *fd, Object *ob)
 	/* weak weak... this was only meant as draw flag, now is used in give_base_to_objects too */
 	ob->flag &= ~OB_FROMGROUP;
 
+	/* This is a transient flag; clear in order to avoid unneeded object update pending from
+	 * time when file was saved.
+	 */
+	ob->recalc = 0;
+
 	/* loading saved files with editmode enabled works, but for undo we like
 	 * to stay in object mode during undo presses so keep editmode disabled.
 	 *




More information about the Bf-blender-cvs mailing list