[Bf-blender-cvs] [1bf97f1156e] temp-lanpr-cleanup2: LANPR: Revert smoke file changes to origin/master.

[YimingWu]

Commit: 1bf97f1156e98e4af644b48fd1c82e0041501d85
Author: YimingWu
Date:   Mon Nov 4 21:26:02 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rB1bf97f1156e98e4af644b48fd1c82e0041501d85

LANPR: Revert smoke file changes to origin/master.

Probably due to a merge error.

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

M	source/blender/blenkernel/intern/smoke.c
M	source/tools

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 30f0eef65da..3db51c95fcb 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3350,14 +3350,16 @@ struct Mesh *smokeModifier_do(
   if (smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain &&
       smd->domain->flags & MOD_SMOKE_ADAPTIVE_DOMAIN && smd->domain->base_res[0]) {
     result = createDomainGeometry(smd->domain, ob);
+    BKE_mesh_copy_settings(result, me);
   }
   else {
     result = BKE_mesh_copy_for_eval(me, false);
   }
-  /* XXX This is really not a nice hack, but until root of the problem is understood,
-   * this should be an acceptable workaround I think.
-   * See T58492 for details on the issue. */
-  result->texflag |= ME_AUTOSPACE;
+
+  /* Smoke simulation needs a texture space relative to the adaptive domain bounds, not the
+   * original mesh. So recompute it at this point in the modifier stack. See T58492. */
+  BKE_mesh_texspace_calc(result);
+
   return result;
 }
 
diff --git a/source/tools b/source/tools
index 2afbb8ec472..24a26488775 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
+Subproject commit 24a26488775dbe8cf2c1273d60a74c9d570d773c