[Bf-blender-cvs] [4601ea8f82c] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 4601ea8f82c673582e33302a1e823299cd91607f
Author: Jacques Lucke
Date:   Sat Dec 28 11:13:44 2019 +0100
Branches: functions
https://developer.blender.org/rB4601ea8f82c673582e33302a1e823299cd91607f

Merge branch 'master' into functions

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



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

diff --cc source/blender/editors/object/object_intern.h
index 4fcdecd61f5,352ba744d92..b744376f2a7
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@@ -171,9 -171,8 +171,9 @@@ void OBJECT_OT_skin_radii_equalize(stru
  void OBJECT_OT_skin_armature_create(struct wmOperatorType *ot);
  void OBJECT_OT_laplaciandeform_bind(struct wmOperatorType *ot);
  void OBJECT_OT_surfacedeform_bind(struct wmOperatorType *ot);
 +void OBJECT_OT_bparticles_clear_cache(struct wmOperatorType *ot);
  
- /* grease pencil modifiers */
+ /* object_gpencil_modifiers.c */
  void OBJECT_OT_gpencil_modifier_add(struct wmOperatorType *ot);
  void OBJECT_OT_gpencil_modifier_remove(struct wmOperatorType *ot);
  void OBJECT_OT_gpencil_modifier_move_up(struct wmOperatorType *ot);