Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 2 Apr 2018 13:18:10 +0000 (15:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 2 Apr 2018 13:18:10 +0000 (15:18 +0200)
28 files changed:
1  2 
build_files/cmake/macros.cmake
doc/doxygen/doxygen.source.h
source/blender/editors/CMakeLists.txt
source/blender/editors/curve/editcurve_add.c
source/blender/editors/curve/editcurve_undo.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_bisect.c
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/undo/memfile_undo.c
source/blender/editors/util/CMakeLists.txt
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c

Simple merge
Simple merge
index c7ce4b44803254786292b13ac4b627cfa364c1b9,17a8eef1bdb2af24fe56082012a2e4c3d7fbd1c2..06f412b7019e0e9f868b4a1ad4b780966ccdc056
@@@ -60,9 -59,9 +60,10 @@@ if(WITH_BLENDER
        add_subdirectory(space_userpref)
        add_subdirectory(space_view3d)
        add_subdirectory(transform)
+       add_subdirectory(undo)
        add_subdirectory(util)
        add_subdirectory(uvedit)
 +      add_subdirectory(screen)
  endif()
  
  add_subdirectory(datafiles)
index 5775835e5ff70ee9856a3b9b45e311cffdcbc647,4ced6ce506c1d373169f2e4a28bbf7d693fcc8ad..4eb2abaefad8e8639d1ae0056c60ea90b111fcb5
@@@ -210,8 -218,8 +219,8 @@@ static void curve_undosys_step_decode(s
  
        CurveUndoStep *us = (CurveUndoStep *)us_p;
        Object *obedit = us->obedit_ref.ptr;
-       undocurve_to_editcurve(&us->data, obedit->data);
+       undocurve_to_editcurve(&us->data, obedit->data, &obedit->shapenr);
 -      DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 +      DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
  }
  
index 8a2baa53d305d4c9f9ab29306ca4996b81c2f195,9f7cd62227c606720fe3671abc23cb16d0ebecf7..e01121ed2778275c3649eb6bbfbb1a968261c8ee
  #include "BKE_unit.h"
  #include "BKE_paint.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "ED_screen.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  #include "ED_keyframing.h"
  
  #include "UI_interface.h"
index 1937a9f689113c13f6d32edec5c8c457bb389545,3a9e278f0395538d93f0eb7526247403d32555a3..741d16206cd57c9313e3cfc61e4bd4b4bc7b6f18
  
  #include "mesh_intern.h"  /* own include */
  
- #include "ED_util.h"
 +#define USE_MANIPULATOR
 +
 +#ifdef USE_MANIPULATOR
 +#include "ED_manipulator_library.h"
++#include "ED_undo.h"
 +#endif
 +
  static int mesh_bisect_exec(bContext *C, wmOperator *op);
  
  /* -------------------------------------------------------------------- */
index 657c3eb2a40e2f475a2bb5f6960ace2524efc87b,9304952814664df023602d5bdfa636dba7254074..64980b84a0b85db779fa0acf15aa2bf6f7682b04
  #include "ED_transform.h"
  #include "ED_view3d.h"
  
 +#include "UI_resources.h"
 +
 +#include "MEM_guardedalloc.h"
 +
  #include "mesh_intern.h"  /* own include */
  
- #include "ED_util.h"
 +#define USE_MANIPULATOR
 +
 +#ifdef USE_MANIPULATOR
 +#include "ED_manipulator_library.h"
++#include "ED_undo.h"
 +#endif
 +
  /* -------------------------------------------------------------------- */
  /** \name Extrude Internal Utilities
   * \{ */
index 1da1efc9cf4e8cdff4017c3c7b54f782c274ef7b,84711bf7c3cd0ecfb77314761e2ead09412f5506..c19dcc0e1cbfd1eac37657b06afd601b33fd36eb
  #include "BKE_scene.h"
  #include "BKE_sequencer.h"
  
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_build.h"
 +
  #include "ED_armature.h"
  #include "ED_object.h"
 +#include "ED_scene.h"
  #include "ED_screen.h"
  #include "ED_sequencer.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  
  #include "WM_api.h"
  #include "WM_types.h"
index 69904b7f1b44a4df99f0fe96e0449654c18b040b,c336069bff83d3b3f56921c8b882f09d7aa1a7f0..756c46b4e8a6f938a50590d8e68d98d5540414d1
  
  #include "../blenloader/BLO_undofile.h"
  
- #include "util_intern.h"
+ #include "undo_intern.h"
  
 +/** Store workspace modes in undo steps, this may be removed if find a better way to handle. */
 +#define USE_WORKSPACE_OBJECT_MODE_HACK
 +
 +#ifdef USE_WORKSPACE_OBJECT_MODE_HACK
 +#include "MEM_guardedalloc.h"
 +#include "BLI_string.h"
 +#include "BLI_listbase.h"
 +#include "BKE_main.h"
 +#include "DNA_workspace_types.h"
 +#endif
 +
 +
  /* -------------------------------------------------------------------- */
  /** \name Implements ED Undo System
   * \{ */
index ebe68bc8f35f62ddb98f759fedb3212b869062fe,f46358f83cfef61c53a18bcb78c728948dc28e8a..e19ec6ca265b277e5403630d0df7e09ee8344f97
  
  #include "ED_numinput.h"
  #include "ED_screen.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  #include "ED_view3d.h"
  
 -#include "GPU_basic_shader.h"
 -
  #include "RNA_access.h"
  #include "RNA_define.h"
  #include "RNA_enum_types.h"