diff options
| author | YimingWu <xp8110@outlook.com> | 2019-07-25 09:34:45 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2019-07-25 09:34:45 +0300 |
| commit | 9e4cc7c6301f97ab74abb58caa6a9db7f2862fe9 (patch) | |
| tree | 39ab3f26284250b558dca85b5b79d72182ac13c9 /source/blender/editors/mesh/editmesh_tools.c | |
| parent | caab047f9c649e261cb0d8f0fa8fb06e0c1b1ca6 (diff) | |
| parent | e51943bd7326a14c684a100690a6652dd9e1b931 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2019-npr
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index e5704879370..add074985b1 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -4593,7 +4593,8 @@ static int edbm_fill_grid_exec(bContext *C, wmOperator *op) /* Only reuse on redo because these settings need to match the current selection. * We never want to use them on other geometry, repeat last for eg, see: T60777. */ - if ((op->flag & OP_IS_REPEAT_LAST) == 0 && RNA_property_is_set(op->ptr, prop_span)) { + if (((op->flag & OP_IS_INVOKE) || (op->flag & OP_IS_REPEAT_LAST) == 0) && + RNA_property_is_set(op->ptr, prop_span)) { span = RNA_property_int_get(op->ptr, prop_span); span = min_ii(span, (clamp / 2) - 1); calc_span = false; |