archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source 
- 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).
This commit is contained in:
Campbell Barton
2018-04-01 11:03:25 +02:00
parent 916c91bd08 473f17b3d5
commit b65ea517eb
134 changed files with 4316 additions and 2256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/include/ED_particle.h
View File

@@ -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__ */