Commit: 69b7ae839744b63ef6812bf2d1ce72f2ce4e64dc
Author: Campbell Barton
Date: Thu Jul 12 14:46:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB69b7ae839744b63ef6812bf2d1ce72f2ce4e64dc
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenlib/BLI_callbacks.h
index c913510bda3,3db7d2d87f1..f53a4b385b4
--- a/source/blender/blenlib/BLI_callbacks.h
+++ b/source/blender/blenlib/BLI_callbacks.h
@@@ -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_UNDO_PRE,
+ BLI_CB_EVT_UNDO_POST,
+ BLI_CB_EVT_REDO_PRE,
+ BLI_CB_EVT_REDO_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_VERSION_UPDATE,
BLI_CB_EVT_TOT
} eCbEvent;
diff --cc source/blender/editors/undo/ed_undo.c
index c090414bc22,b4268dac863..7bbb2479a52
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@@ -36,9 -36,10 +36,11 @@@
#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"
diff --cc source/blender/python/intern/bpy_app_handlers.c
index 948a78d5794,ded5ead93aa..72bc5bbc910
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@@ -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 *)"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 *)"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 *)"version_update", (char *)"on ending the versioning code"},
/* sets the permanent tag */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
