Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-03 09:57:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-03 09:57:01 +0300
commitb3004d30f5d5060035c5f8ac4cb6338463872877 (patch)
tree1d6c67bbfe50ebdf100d7c11043d87b98e56374d /source/blender/editors/physics
parent72ae0e1b6d3057d92420f7ccff88592946e61937 (diff)
Undo: remove particle undo push
Was only called on copy particle system which is already doing an undo push.
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r--source/blender/editors/physics/particle_edit.c6
-rw-r--r--source/blender/editors/physics/particle_edit_undo.c16
-rw-r--r--source/blender/editors/physics/particle_object.c2
3 files changed, 0 insertions, 24 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index fce43fa6425..bdffaf31384 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4377,12 +4377,6 @@ void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, Partic
if (psys && !cache)
recalc_emitter_field(ob, psys);
PE_update_object(scene, ob, 1);
-
- /* Causes issues, adding undo pushes while performing undo history.
- * Seems not to like this isn't needed anyway - Campbell. */
-#if 0
- PE_undo_push(scene, "Original");
-#endif
}
}
diff --git a/source/blender/editors/physics/particle_edit_undo.c b/source/blender/editors/physics/particle_edit_undo.c
index 6e212174f39..ef0a2711fdd 100644
--- a/source/blender/editors/physics/particle_edit_undo.c
+++ b/source/blender/editors/physics/particle_edit_undo.c
@@ -53,7 +53,6 @@
#include "ED_object.h"
#include "ED_particle.h"
#include "ED_physics.h"
-#include "ED_undo.h"
#include "particle_edit_utildefines.h"
@@ -296,18 +295,3 @@ void ED_particle_undosys_type(UndoType *ut)
}
/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Utilities
- * \{ */
-
-void PE_undo_push(struct Scene *scene, const char *str)
-{
- UndoStack *ustack = ED_undo_stack_get();
- bContext *C_temp = CTX_create();
- CTX_data_scene_set(C_temp, scene);
- BKE_undosys_step_push_with_type(ustack, C_temp, str, BKE_UNDOSYS_TYPE_PARTICLE);
- CTX_free(C_temp);
-}
-
-/** \} */
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 63b84df9fce..53a70abca05 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -940,8 +940,6 @@ static void copy_particle_edit(Scene *scene, Object *ob, ParticleSystem *psys, P
recalc_lengths(edit);
recalc_emitter_field(ob, psys);
PE_update_object(scene, ob, true);
-
- PE_undo_push(scene, "Original");
}
static void remove_particle_systems_from_object(Object *ob_to)