[Bf-blender-cvs] [f651847597f] undo-write: Minor cleanup.

Bastien Montagne noreply at git.blender.org
Tue Jun 2 12:47:28 CEST 2020


Commit: f651847597f0ec8f67ce528f03bbbdb6ddb2de87
Author: Bastien Montagne
Date:   Tue Jun 2 12:47:11 2020 +0200
Branches: undo-write
https://developer.blender.org/rBf651847597f0ec8f67ce528f03bbbdb6ddb2de87

Minor cleanup.

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

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

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 87e888c0ce1..365a0cd7dcc 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -327,12 +327,6 @@ typedef struct {
   bool error;
 
   /** #MemFile writing (used for undo). */
-  struct {
-    MemFile *current;
-    MemFile *compare;
-    /** Use to de-duplicate chunks when writing. */
-    MemFileChunk *compare_chunk;
-  } mem_old;
   MemFileWriteData mem;
   /** When true, write to #WriteData.current, could also call 'is_undo'. */
   bool use_memfile;
@@ -508,7 +502,7 @@ static bool mywrite_end(WriteData *wd)
  *
  * Only does something when storing an undo step.
  */
-static void mywrite_id_start(WriteData *wd, ID *id)
+static void mywrite_id_begin(WriteData *wd, ID *id)
 {
   if (wd->use_memfile) {
     printf("START writing id %s\n", id->name);
@@ -4191,7 +4185,7 @@ static bool write_file_handle(Main *mainvar,
           }
         }
 
-        mywrite_id_start(wd, id);
+        mywrite_id_begin(wd, id);
 
         memcpy(id_buffer, id, idtype_struct_size);



More information about the Bf-blender-cvs mailing list