[Bf-blender-cvs] [43f895a5924] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 43f895a59247ea4058cb3f019cd4dabd9ad9b0e4
Author: Jacques Lucke
Date:   Mon Apr 6 11:10:19 2020 +0200
Branches: functions
https://developer.blender.org/rB43f895a59247ea4058cb3f019cd4dabd9ad9b0e4

Merge branch 'master' into functions

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



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

diff --cc source/blender/editors/object/object_ops.c
index b15e2a851b5,fef046169a7..c68aa1bc7d2
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -265,9 -265,9 +265,11 @@@ void ED_operatortypes_object(void
    WM_operatortype_append(OBJECT_OT_hide_collection);
  
    WM_operatortype_append(OBJECT_OT_voxel_remesh);
+   WM_operatortype_append(OBJECT_OT_voxel_size_edit);
+ 
    WM_operatortype_append(OBJECT_OT_quadriflow_remesh);
 +
 +  WM_operatortype_append(OBJECT_OT_bparticles_clear_cache);
  }
  
  void ED_operatormacros_object(void)