diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-04 16:28:47 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-04 16:30:34 +0300 |
| commit | 2c21e3e35f304afdc1a320fb8ccef91e0119dfc8 (patch) | |
| tree | b30f0ac06de3b2d9d9362191defd6920cb9f70b9 /source/blender/editors/include/ED_object.h | |
| parent | 1753177ad8acfabbcc74c3d8e20fa874f2b97167 (diff) | |
Fix T60132: Convert hair particles to mesh
Needed to port operator to use evaluated particle system.
But also changed interface to always show Convert button when
draw type is set to Path (Hair particle system is forced to
be draws as path). This avoid rather expensive lookup on every
redraw, but will show Convert button for un-baked particle
emitter.
Probably, an acceptable compromise.
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index fd0635e31ef..7f7e74a4e4e 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -248,7 +248,7 @@ void ED_object_modifier_clear(struct Main *bmain, struct Object *ob); int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_convert( - struct ReportList *reports, struct Main *bmain, struct Scene *scene, + struct ReportList *reports, struct Main *bmain, struct Depsgraph *depsgraph, struct Scene *scene, struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md); int ED_object_modifier_apply( struct Main *bmain, struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene, |