[Bf-blender-cvs] [f7770cb97bb] temp-lanpr-review: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: f7770cb97bb9d19d0806f67da9377129fd4d09b0
Author: YimingWu
Date:   Sat Feb 1 10:35:40 2020 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBf7770cb97bb9d19d0806f67da9377129fd4d09b0

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

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



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

diff --cc source/blender/blenkernel/intern/library_query.c
index bda1cac80e4,5fd852ff089..12a90906d1f
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -484,19 -501,8 +501,12 @@@ static void library_foreach_ID_link(Mai
            SEQ_END;
          }
  
-         for (CollectionObject *cob = scene->master_collection->gobject.first; cob;
-              cob = cob->next) {
-           CALLBACK_INVOKE(cob->ob, IDWALK_CB_USER);
-         }
-         for (CollectionChild *child = scene->master_collection->children.first; child;
-              child = child->next) {
-           CALLBACK_INVOKE(child->collection, IDWALK_CB_USER);
-         }
+         library_foreach_collection(&data, scene->master_collection);
  
 +        if (scene->master_collection->lanpr) {
 +          CALLBACK_INVOKE(scene->master_collection->lanpr->target, IDWALK_CB_USER);
 +        }
 +
          ViewLayer *view_layer;
          for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
            CALLBACK_INVOKE(view_layer->mat_override, IDWALK_CB_USER);
diff --cc source/blender/blenloader/intern/versioning_280.c
index dc8e5e9f97e,e92ae6e73cc..3c4b153d2ed
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4330,5 -4403,18 +4416,18 @@@ void blo_do_versions_280(FileData *fd, 
          }
        }
      }
+ 
+     /* Brush cursor alpha */
+     for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+       br->add_col[3] = 0.9f;
+       br->sub_col[3] = 0.9f;
+     }
+ 
+     /* Pose brush IK segments. */
+     for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+       if (br->pose_ik_segments == 0) {
+         br->pose_ik_segments = 1;
+       }
+     }
    }
 -}
 +}