Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 12:46:48 +0000 (14:46 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 12:46:48 +0000 (14:46 +0200)
1  2 
source/blender/blenlib/BLI_callbacks.h
source/blender/editors/undo/ed_undo.c
source/blender/makesrna/intern/rna_color.c
source/blender/python/intern/bpy_app_handlers.c

index c913510bda3981c55f79578cd8cd312c23ec7c1a,3db7d2d87f182962d377a3fe2f12486c60f1b21c..f53a4b385b4c944bf4cbca94fca3375c6c8131d7
@@@ -49,6 -49,14 +49,10 @@@ typedef enum 
        BLI_CB_EVT_LOAD_POST,
        BLI_CB_EVT_SAVE_PRE,
        BLI_CB_EVT_SAVE_POST,
 -      BLI_CB_EVT_SCENE_UPDATE_PRE,
 -      BLI_CB_EVT_SCENE_UPDATE_POST,
 -      BLI_CB_EVT_GAME_PRE,
 -      BLI_CB_EVT_GAME_POST,
+       BLI_CB_EVT_UNDO_PRE,
+       BLI_CB_EVT_UNDO_POST,
+       BLI_CB_EVT_REDO_PRE,
+       BLI_CB_EVT_REDO_POST,
        BLI_CB_EVT_VERSION_UPDATE,
        BLI_CB_EVT_TOT
  } eCbEvent;
index c090414bc227f25750724bca745a036fd36ad5a5,b4268dac8637161940714d67dd4500ab7bb0355d..7bbb2479a52886d6d8f4b56509ac2a069a1d0bcc
  #include "CLG_log.h"
  
  #include "DNA_scene_types.h"
 +#include "DNA_object_types.h"
  
  #include "BLI_utildefines.h"
+ #include "BLI_callbacks.h"
+ #include "BLI_listbase.h"
  
  #include "BLT_translation.h"
  
index 948a78d579440211ca62b9c3bc1379bea118d924,ded5ead93aa580cb5d5f1fc6d4b5f3983d1015a4..72bc5bbc9102ce1c04be44d9771a9d708c31a52a
@@@ -59,6 -59,18 +59,10 @@@ static PyStructSequence_Field app_cb_in
        {(char *)"load_post",         (char *)"on loading a new blend file (after)"},
        {(char *)"save_pre",          (char *)"on saving a blend file (before)"},
        {(char *)"save_post",         (char *)"on saving a blend file (after)"},
 -      {(char *)"scene_update_pre",  (char *)"on every scene data update. Does not imply that anything changed in the "
 -                                          "scene, just that the dependency graph is about to be reevaluated, and the "
 -                                          "scene is about to be updated by Blender's animation system."},
 -      {(char *)"scene_update_post",  (char *)"on every scene data update. Does not imply that anything changed in the "
 -                                           "scene, just that the dependency graph was reevaluated, and the scene was "
 -                                           "possibly updated by Blender's animation system."},
 -      {(char *)"game_pre",          (char *)"on starting the game engine"},
 -      {(char *)"game_post",         (char *)"on ending the game engine"},
+       {(char *)"undo_pre",          (char *)"on loading an undo step (before)"},
+       {(char *)"undo_post",         (char *)"on loading an undo step (after)"},
+       {(char *)"redo_pre",          (char *)"on loading a redo step (before)"},
+       {(char *)"redo_post",         (char *)"on loading a redo step (after)"},
        {(char *)"version_update",    (char *)"on ending the versioning code"},
  
        /* sets the permanent tag */