diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
| commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
| tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /source/blender/editors/include/ED_particle.h | |
| parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
| parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) | |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'source/blender/editors/include/ED_particle.h')
| -rw-r--r-- | source/blender/editors/include/ED_particle.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index ee60d1c8eef..b3e274a235a 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -39,13 +39,14 @@ struct rcti; struct PTCacheEdit; struct Scene; struct ViewLayer; +struct UndoType; /* particle edit mode */ void PE_free_ptcache_edit(struct PTCacheEdit *edit); int PE_start_edit(struct PTCacheEdit *edit); /* access */ -struct PTCacheEdit *PE_get_current(struct Scene *scene, struct ViewLayer *view_layer, struct Object *ob); +struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob); struct PTCacheEdit *PE_create_current(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); void PE_current_changed(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); int PE_minmax(struct Scene *scene, struct ViewLayer *view_layer, float min[3], float max[3]); @@ -64,14 +65,8 @@ int PE_circle_select(struct bContext *C, int selecting, const int mval[2], float int PE_lasso_select(struct bContext *C, const int mcords[][2], const short moves, bool extend, bool select); void PE_deselect_all_visible(struct PTCacheEdit *edit); -/* undo */ -void PE_undo_push(struct Scene *scene, struct ViewLayer *view_layer, const char *str); -void PE_undo_step(struct Scene *scene, struct ViewLayer *view_layer, int step); -void PE_undo(struct Scene *scene, struct ViewLayer *view_layer); -void PE_redo(struct Scene *scene, struct ViewLayer *view_layer); -bool PE_undo_is_valid(struct Scene *scene, struct ViewLayer *view_layer); -void PE_undo_number(struct Scene *scene, struct ViewLayer *view_layer, int nr); -const char *PE_undo_get_name(struct Scene *scene, struct ViewLayer *view_layer, int nr, bool *r_active); +/* particle_edit_undo.c */ +void ED_particle_undosys_type(struct UndoType *ut); #endif /* __ED_PARTICLE_H__ */ |