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

[Jacques Lucke]

Commit: a8eb9448e74aadf75eab41a6faa97bc28e5a4709
Author: Jacques Lucke
Date:   Fri Aug 16 15:03:06 2019 +0200
Branches: functions
https://developer.blender.org/rBa8eb9448e74aadf75eab41a6faa97bc28e5a4709

Merge branch 'master' into functions

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



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

diff --cc source/blender/editors/object/object_ops.c
index e160f73e3aa,38c06319450..0a9915679f1
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -258,7 -258,7 +258,8 @@@ void ED_operatortypes_object(void
    WM_operatortype_append(OBJECT_OT_hide_view_set);
    WM_operatortype_append(OBJECT_OT_hide_collection);
  
+   WM_operatortype_append(OBJECT_OT_voxel_remesh);
 +  WM_operatortype_append(OBJECT_OT_bparticles_clear_cache);
  }
  
  void ED_operatormacros_object(void)