[Bf-blender-cvs] [a3dc4a472d3] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: a3dc4a472d3f2eb211294612a6afce41890f9636
Author: YimingWu
Date:   Sun Jun 21 16:29:31 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBa3dc4a472d3f2eb211294612a6afce41890f9636

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	release/datafiles/locale
#	release/scripts/addons
#	release/scripts/addons_contrib
#	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenkernel/intern/collection.c
index b26edc251c9,dddbf7d45b2..294667f8a8c
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@@ -72,17 -75,12 +75,21 @@@ static CollectionParent *collection_fin
  
  static bool collection_find_child_recursive(Collection *parent, Collection *collection);
  
- /****************************** Collection Datablock ************************/
+ /** \} */
+ 
+ /* -------------------------------------------------------------------- */
+ /** \name Collection Data-Block
+  * \{ */
  
 +static void collection_lanpr_copy(const Collection *src, Collection *dst)
 +{
 +  if (src->lanpr) {
 +    CollectionLANPR *lanpr = MEM_callocN(sizeof(CollectionLANPR), "CollectionLANPR");
 +    dst->lanpr = lanpr;
 +    memcpy(dst->lanpr, src->lanpr, sizeof(CollectionLANPR));
 +  }
 +}
 +
  /**
   * Only copy internal data of Collection ID from source
   * to already allocated/initialized destination.
diff --cc source/blender/blenloader/intern/readfile.c
index 1f5b785e6c5,5b5cf8e6232..5f1a5acf3f0
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6369,12 -6333,6 +6336,11 @@@ static void lib_link_collection_data(Fi
    for (CollectionChild *child = collection->children.first; child != NULL; child = child->next) {
      child->collection = newlibadr(fd, lib, child->collection);
    }
 +
 +  if (collection->lanpr) {
 +    collection->lanpr->target = newlibadr(fd, lib, collection->lanpr->target);
 +  }
 +
-   BKE_collection_parent_relations_rebuild(collection);
  }
  
  static void lib_link_collection(FileData *fd, Main *UNUSED(bmain), Collection *collection)
diff --cc source/blender/blenloader/intern/versioning_280.c
index 3bb48fb476c,0648264466d..1093d00d1f3
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -5088,6 -5075,23 +5088,23 @@@ void blo_do_versions_280(FileData *fd, 
     * \note Keep this message at the bottom of the function.
     */
    {
+     /* Set the cloth wind factor to 1 for old forces. */
+     if (!DNA_struct_elem_find(fd->filesdna, "PartDeflect", "float", "f_wind_factor")) {
+       LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+         if (ob->pd) {
+           ob->pd->f_wind_factor = 1.0f;
+         }
+       }
+       LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) {
+         if (part->pd) {
+           part->pd->f_wind_factor = 1.0f;
+         }
+         if (part->pd2) {
+           part->pd2->f_wind_factor = 1.0f;
+         }
+       }
+     }
+ 
      /* Keep this block, even when empty. */
    }
 -}
 +}