blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-06-13 18:25:23 +02:00
parent 2e23385c35 57cd52a4ab
commit a3c630aebb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/physics/particle_edit.c
View File

@ -4078,8 +4078,11 @@ static int brush_edit_modal(bContext *C, wmOperator *op, const wmEvent *event)
case LEFTMOUSE:
case MIDDLEMOUSE:
case RIGHTMOUSE: // XXX hardcoded
brush_edit_exit(op);
return OPERATOR_FINISHED;
if (event->val == KM_RELEASE) {
brush_edit_exit(op);
return OPERATOR_FINISHED;
}
break;
case MOUSEMOVE:
brush_edit_apply_event(C, op, event);
break;