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

[Jacques Lucke]

Commit: ef7f059216ca5876cf9265ae67e7cb7c4f4ecd72
Author: Jacques Lucke
Date:   Fri Sep 13 12:16:59 2019 +0200
Branches: functions
https://developer.blender.org/rBef7f059216ca5876cf9265ae67e7cb7c4f4ecd72

Merge branch 'master' into functions

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



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

diff --cc source/blender/editors/object/object_ops.c
index 42f59bd4e10,f6b08b953a4..d70faf996cf
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -259,7 -259,7 +259,9 @@@ void ED_operatortypes_object(void
    WM_operatortype_append(OBJECT_OT_hide_collection);
  
    WM_operatortype_append(OBJECT_OT_voxel_remesh);
+   WM_operatortype_append(OBJECT_OT_quadriflow_remesh);
++
 +  WM_operatortype_append(OBJECT_OT_bparticles_clear_cache);
  }
  
  void ED_operatormacros_object(void)
diff --cc tests/gtests/blenlib/CMakeLists.txt
index 36d2a83fd8a,1d4b0b18973..4785201da57
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -54,23 -51,17 +54,20 @@@ BLENDER_TEST(BLI_heap "bf_blenlib"
  BLENDER_TEST(BLI_heap_simple "bf_blenlib")
  BLENDER_TEST(BLI_index_range "bf_blenlib")
  BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_numaapi")
 +BLENDER_TEST(BLI_lazy_init "bf_blenlib")
  BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib;bf_intern_numaapi")
  BLENDER_TEST(BLI_listbase "bf_blenlib")
+ BLENDER_TEST(BLI_map "bf_blenlib")
  BLENDER_TEST(BLI_math_base "bf_blenlib")
  BLENDER_TEST(BLI_math_color "bf_blenlib")
  BLENDER_TEST(BLI_math_geom "bf_blenlib")
  BLENDER_TEST(BLI_memiter "bf_blenlib")
 +BLENDER_TEST(BLI_multi_vector "bf_blenlib")
 +BLENDER_TEST(BLI_optional "bf_blenlib")
  BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
  BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
- BLENDER_TEST(BLI_refcount "bf_blenlib")
  BLENDER_TEST(BLI_set "bf_blenlib")
  BLENDER_TEST(BLI_set_vector "bf_blenlib")
- BLENDER_TEST(BLI_stack_cpp "bf_blenlib")
- BLENDER_TEST(BLI_map "bf_blenlib")
- BLENDER_TEST(BLI_multi_map "bf_blenlib")
  BLENDER_TEST(BLI_stack "bf_blenlib")
  BLENDER_TEST(BLI_stack_cxx "bf_blenlib")
  BLENDER_TEST(BLI_string "bf_blenlib")