[Bf-blender-cvs] [dc41a99a54a] undo-experiments-idnames: Cleanup .orig files from some merge...
Bastien Montagne
noreply at git.blender.org
Tue Jan 14 13:42:47 CET 2020
Commit: dc41a99a54a817a9cb6cc0dcfaae6c7bef1ab1c0
Author: Bastien Montagne
Date: Tue Jan 14 13:41:04 2020 +0100
Branches: undo-experiments-idnames
https://developer.blender.org/rBdc41a99a54a817a9cb6cc0dcfaae6c7bef1ab1c0
Cleanup .orig files from some merge...
===================================================================
D source/blender/blenkernel/BKE_blender_undo.h.orig
D source/blender/blenkernel/intern/blender_undo.c.orig
D source/blender/blenloader/intern/readfile.c.orig
D source/blender/editors/undo/memfile_undo.c.orig
===================================================================
diff --git a/source/blender/blenkernel/BKE_blender_undo.h.orig b/source/blender/blenkernel/BKE_blender_undo.h.orig
deleted file mode 100644
index d1663a2e7f9..00000000000
--- a/source/blender/blenkernel/BKE_blender_undo.h.orig
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-#ifndef __BKE_BLENDER_UNDO_H__
-#define __BKE_BLENDER_UNDO_H__
-
-/** \file
- * \ingroup bke
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct Main;
-struct MemFileUndoData;
-struct bContext;
-
-#define BKE_UNDO_STR_MAX 64
-
-struct MemFileUndoData *BKE_memfile_undo_encode(struct Main *bmain,
- struct MemFileUndoData *mfu_prev);
-bool BKE_memfile_undo_decode(struct MemFileUndoData *mfu,
-<<<<<<< HEAD
- const bool use_old_bmain_data,
-=======
- const int undo_direction,
->>>>>>> undo-experiments
- struct bContext *C);
-void BKE_memfile_undo_free(struct MemFileUndoData *mfu);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __BKE_BLENDER_UNDO_H__ */
diff --git a/source/blender/blenkernel/intern/blender_undo.c.orig b/source/blender/blenkernel/intern/blender_undo.c.orig
deleted file mode 100644
index eb0a93a773c..00000000000
--- a/source/blender/blenkernel/intern/blender_undo.c.orig
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/** \file
- * \ingroup bke
- *
- * Blend file undo (known as 'Global Undo').
- * DNA level diffing for undo.
- */
-
-#ifndef _WIN32
-# include <unistd.h> // for read close
-#else
-# include <io.h> // for open close read
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <fcntl.h> /* for open */
-#include <errno.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_scene_types.h"
-
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-
-#include "BKE_appdir.h"
-#include "BKE_blender_undo.h" /* own include */
-#include "BKE_blendfile.h"
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_main.h"
-
-#include "BLO_undofile.h"
-#include "BLO_readfile.h"
-#include "BLO_writefile.h"
-
-#include "DEG_depsgraph.h"
-
-/* -------------------------------------------------------------------- */
-/** \name Global Undo
- * \{ */
-
-#define UNDO_DISK 0
-
-<<<<<<< HEAD
-bool BKE_memfile_undo_decode(MemFileUndoData *mfu, const bool use_old_bmain_data, bContext *C)
-=======
-bool BKE_memfile_undo_decode(MemFileUndoData *mfu, const int undo_direction, bContext *C)
->>>>>>> undo-experiments
-{
- Main *bmain = CTX_data_main(C);
- char mainstr[sizeof(bmain->name)];
- int success = 0, fileflags;
-
- BLI_strncpy(mainstr, BKE_main_blendfile_path(bmain), sizeof(mainstr)); /* temporal store */
-
- fileflags = G.fileflags;
- G.fileflags |= G_FILE_NO_UI;
-
- if (UNDO_DISK) {
- success = BKE_blendfile_read(C, mfu->filename, &(const struct BlendFileReadParams){0}, NULL);
- }
- else {
- struct BlendFileReadParams params = {0};
-<<<<<<< HEAD
- if (!use_old_bmain_data) {
- params.skip_flags |= BLO_READ_SKIP_UNDO_OLD_MAIN;
- }
-=======
- params.undo_direction = undo_direction > 0 ? 1 : -1;
->>>>>>> undo-experiments
- success = BKE_blendfile_read_from_memfile(C, &mfu->memfile, ¶ms, NULL);
- }
-
- /* Restore, bmain has been re-allocated. */
- bmain = CTX_data_main(C);
- BLI_strncpy(bmain->name, mainstr, sizeof(bmain->name));
- G.fileflags = fileflags;
-
- if (success) {
- /* important not to update time here, else non keyed transforms are lost */
- DEG_on_visible_update(bmain, false);
- }
-
- return success;
-}
-
-MemFileUndoData *BKE_memfile_undo_encode(Main *bmain, MemFileUndoData *mfu_prev)
-{
- MemFileUndoData *mfu = MEM_callocN(sizeof(MemFileUndoData), __func__);
-
- /* disk save version */
- if (UNDO_DISK) {
- static int counter = 0;
- char filename[FILE_MAX];
- char numstr[32];
- int fileflags = G.fileflags & ~(G_FILE_HISTORY); /* don't do file history on undo */
-
- /* Calculate current filename. */
- counter++;
- counter = counter % U.undosteps;
-
- BLI_snprintf(numstr, sizeof(numstr), "%d.blend", counter);
- BLI_make_file_string("/", filename, BKE_tempdir_session(), numstr);
-
- /* success = */ /* UNUSED */ BLO_write_file(bmain, filename, fileflags, NULL, NULL);
-
- BLI_strncpy(mfu->filename, filename, sizeof(mfu->filename));
- }
- else {
- MemFile *prevfile = (mfu_prev) ? &(mfu_prev->memfile) : NULL;
- /* success = */ /* UNUSED */ BLO_write_file_mem(bmain, prevfile, &mfu->memfile, G.fileflags);
- mfu->undo_size = mfu->memfile.size;
- }
-
- bmain->is_memfile_undo_written = true;
-
- return mfu;
-}
-
-void BKE_memfile_undo_free(MemFileUndoData *mfu)
-{
- BLO_memfile_free(&mfu->memfile);
- MEM_freeN(mfu);
-}
-
-/** \} */
diff --git a/source/blender/blenloader/intern/readfile.c.orig b/source/blender/blenloader/intern/readfile.c.orig
deleted file mode 100644
index f3dc9612c1e..00000000000
--- a/source/blender/blenloader/intern/readfile.c.orig
+++ /dev/null
@@ -1,12442 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- */
-
-/** \file
- * \ingroup blenloader
- */
-
-#include "zlib.h"
-
-#include <limits.h>
-#include <stdlib.h> /* for atoi. */
-#include <stddef.h> /* for offsetof. */
-#include <fcntl.h> /* for open flags (O_BINARY, O_RDONLY). */
-#include <stdarg.h> /* for va_start/end. */
-#include <time.h> /* for gmtime. */
-#include <ctype.h> /* for isdigit. */
-
-#include "BLI_utildefines.h"
-#ifndef WIN32
-# include <unistd.h> // for read close
-#else
-# include <io.h> // for open close read
-# include "winsock2.h"
-# include "BLI_winstuff.h"
-#endif
-
-/* allow readfile to use deprecated functionality */
-#define DNA_DEPRECATED_ALLOW
-
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_brush_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_cachefile_types.h"
-#include "DNA_cloth_types.h"
-#include "DNA_collection_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_dynamicpaint_types.h"
-#include "DNA_effect_types.h"
-#include "DNA_fileglobal_types.h"
-#include "DNA_genfile.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_gpencil_modifier_types.h"
-#include "DNA_shader_fx_types.h"
-#include "DNA_ipo_types.h"
-#include "DNA_key_types.h"
-#include "DNA_lattice_types.h"
-#include "DNA_layer_types.h"
-#include "DNA_light_types.h"
-#include "DNA_linestyle_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_nla_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_fluidsim_types.h"
-#include "DNA_object_types.h"
-#include "DNA_packedFile_types.h"
-#include "DNA_particle_types.h"
-#include "DNA_curveprofile_types.h"
-#include "DNA_lightprobe_types.h"
-#include "DNA_rigidbody_types.h"
-#include "DNA_text_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_sdna_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_sequence_types.h"
-#include "DNA_fluid_types.h"
-#include "DNA_speaker_types.h"
-#include "DNA_sound_types.h"
-#include "DNA_space_types.h"
-#include "DNA_vfont_types.h"
-#include "DNA_workspace_types.h"
-#include "DNA_world_types.h"
-#include "DNA_movieclip_types.h"
-#include "DNA_mask_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_endian_switch.h"
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_threads.h"
-#include "BLI_mempool.h"
-#include "BLI_ghash.h"
-
-#include "BLT_translation.h"
-
-#include "BKE_action.h"
-#include "BKE_armature.h"
-#include "BKE_brush.h"
-#include "BKE_collection.h"
-#include "BKE_colortools.h"
-#include "BKE_constraint.h"
-#include "BKE_curve.h"
-#include "BKE_effect.h"
-#include "BKE_fcurve.h"
-#include "BKE_fluid.h"
-#include "BKE_global.h" // for G
-#include "BKE_gpencil_modifier.h"
-#include "BKE_idcode.h"
-#include "BKE_idprop.h"
-#include "BKE_layer.h"
-#include "BKE_library.h"
-#include "BKE_library_idmap.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list