[Bf-blender-cvs] [275d3920a0f] soc-2019-bevel-profiles: Merge branch 'master' into soc-2019-bevel-profiles

[Hans Goudey]

Commit: 275d3920a0f02c98262eb480263a9e089d2e2ba8
Author: Hans Goudey
Date:   Wed Nov 20 14:12:00 2019 -0500
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rB275d3920a0f02c98262eb480263a9e089d2e2ba8

Merge branch 'master' into soc-2019-bevel-profiles

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_handlers.c
index 566e913d6ef,806b5789df1..673e4c1a8da
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -2564,11 -2540,10 +2580,14 @@@ static void ui_but_copy(bContext *C, ui
        ui_but_copy_curvemapping(but);
        break;
  
 +    case UI_BTYPE_CURVEPROFILE:
 +      ui_but_copy_CurveProfile(but);
 +      break;
 +
      case UI_BTYPE_BUT:
+       if (!but->optype) {
+         break;
+       }
        ui_but_copy_operator(C, but, buf, buf_max_len);
        is_buf_set = true;
        break;