[Bf-blender-cvs] [392e58afb32] master: Fix (unreported) invalid handling of IDs usercount in `BKE_mesh_new_from_object_to_bmain()`.

[Bastien Montagne]

Commit: 392e58afb32162d7d31e5cfc0d6206382e7e7d62
Author: Bastien Montagne
Date:   Mon May 27 16:46:45 2019 +0200
Branches: master
https://developer.blender.org/rB392e58afb32162d7d31e5cfc0d6206382e7e7d62

Fix (unreported) invalid handling of IDs usercount in `BKE_mesh_new_from_object_to_bmain()`.

Would have broken usercount of mesh used as texco reference e.g.

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

M	source/blender/blenkernel/intern/mesh_convert.c

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

diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index c7ddb8628f9..fce80272738 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1179,7 +1179,15 @@ static int foreach_libblock_make_original_and_usercount_callback(void *user_data
     return IDWALK_RET_NOP;
   }
   *id_p = DEG_get_original_id(*id_p);
-  id_us_plus(*id_p);
+
+  if (cb_flag & IDWALK_CB_USER) {
+    id_us_plus(*id_p);
+  }
+  else if (cb_flag & IDWALK_CB_USER_ONE) {
+    /* Note: in that context, that one should not be needed (since there should be at least already
+     * one USER_ONE user of that ID), but better be consistent. */
+    id_us_ensure_real(*id_p);
+  }
   return IDWALK_RET_NOP;
 }