[Bf-blender-cvs] [50b76094789] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: 50b76094789b7063dba5ac09724c690c9f361247
Author: YimingWu
Date:   Sun Apr 3 16:49:41 2022 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB50b76094789b7063dba5ac09724c690c9f361247

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/draw/intern/draw_cache_impl_subdivision.cc
index e92f354642c,2653035a39f..b66859220c9
--- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc
+++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
@@@ -631,11 -631,11 +631,14 @@@ static void draw_subdiv_cache_extra_coa
    for (int i = 0; i < mesh->totpoly; i++) {
      uint32_t flag = 0;
      if ((mesh->mpoly[i].flag & ME_SMOOTH) != 0) {
-       flag = SUBDIV_COARSE_FACE_FLAG_SMOOTH;
+       flag |= SUBDIV_COARSE_FACE_FLAG_SMOOTH;
+     }
+     if ((mesh->mpoly[i].flag & ME_FACE_SEL) != 0) {
+       flag |= SUBDIV_COARSE_FACE_FLAG_SELECT;
      }
 +    if ((mesh->mpoly[i].flag & ME_FACE_SEL) != 0) {
 +      flag = SUBDIV_COARSE_FACE_FLAG_SELECT;
 +    }
      flags_data[i] = (uint)(mesh->mpoly[i].loopstart) | (flag << SUBDIV_COARSE_FACE_FLAG_OFFSET);
    }
  }
diff --cc source/blender/draw/intern/draw_manager_data.c
index 2c9ebfc080e,8c7cd6d1648..caf56098571
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@@ -616,10 -614,10 +614,10 @@@ static void drw_call_obinfos_init(DRWOb
    drw_call_calc_orco(ob, ob_infos->orcotexfac);
    /* Random float value. */
    uint random = (DST.dupli_source) ?
-                      DST.dupli_source->random_id :
-                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
-                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
-                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
+                     DST.dupli_source->random_id :
 -                     /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
 -                      * put it in ob->runtime and make depsgraph ensure it is up to date. */
 -                     BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
++                    /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
++                     * put it in ob->runtime and make depsgraph ensure it is up to date. */
++                    BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
    ob_infos->ob_random = random * (1.0f / (float)0xFFFFFFFF);
    /* Object State. */
    ob_infos->ob_flag = 1.0f; /* Required to have a correct sign */
diff --cc source/blender/io/wavefront_obj/exporter/obj_export_io.hh
index 0095384609a,0d7c089ec14..5374a69c97e
--- a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
@@@ -316,7 -316,7 +316,7 @@@ class FormatHandler : NonCopyable, NonM
     * `eFileType::MTL`.
     */
    template<typename FileTypeTraits<filetype>::SyntaxType key, typename... T>
--  constexpr void write(T &&...args)
++  constexpr void write(T &&... args)
    {
      /* Get format syntax, number of arguments expected and whether types of given arguments are
       * valid.
@@@ -340,7 -340,7 +340,7 @@@
      }
    }
  
--  template<typename... T> void write_impl(const char *fmt, T &&...args)
++  template<typename... T> void write_impl(const char *fmt, T &&... args)
    {
      /* Format into a local buffer. */
      fmt::memory_buffer buf;