Merge remote-tracking branch 'b/main'

Author: youle31

intern/cycles/kernel/closure/bsdf.h

@@ -275,7 +275,7 @@ ccl_device_inline int bsdf_sample(KernelGlobals kg,
       }
     }
   }
-  else {
+  else if (label != LABEL_NONE) {
     /* Shadow terminator offset. */
     const float frequency_multiplier =
         kernel_data_fetch(objects, sd->object).shadow_terminator_shading_offset;

source/blender/blenkernel/BKE_attribute.h

@@ -96,13 +96,6 @@ bool BKE_attribute_remove(AttributeOwner &owner,
                           blender::StringRef name,
                           struct ReportList *reports);
 
-/**
- * Creates a duplicate attribute layer.
- */
-struct CustomDataLayer *BKE_attribute_duplicate(AttributeOwner &owner,
-                                                blender::StringRef name,
-                                                struct ReportList *reports);
-
 const struct CustomDataLayer *BKE_attribute_search(const AttributeOwner &owner,
                                                    blender::StringRef name,
                                                    eCustomDataMask type,
@@ -134,14 +127,14 @@ int *BKE_attributes_active_index_p(AttributeOwner &owner);
 
 CustomData *BKE_attributes_iterator_next_domain(AttributeOwner &owner,
                                                 struct CustomDataLayer *layers);
-CustomDataLayer *BKE_attribute_from_index(AttributeOwner &owner,
-                                          int lookup_index,
-                                          AttrDomainMask domain_mask,
-                                          eCustomDataMask layer_mask);
+std::optional<blender::StringRef> BKE_attribute_from_index(AttributeOwner &owner,
+                                                           int lookup_index,
+                                                           AttrDomainMask domain_mask,
+                                                           eCustomDataMask layer_mask);
 
 /** Layer is allowed to be nullptr; if so -1 (layer not found) will be returned. */
 int BKE_attribute_to_index(const AttributeOwner &owner,
-                           const CustomDataLayer *layer,
+                           const blender::StringRef name,
                            AttrDomainMask domain_mask,
                            eCustomDataMask layer_mask);
 
@@ -151,9 +144,7 @@ void BKE_id_attributes_active_color_set(struct ID *id, std::optional<blender::St
 void BKE_id_attributes_active_color_clear(struct ID *id);
 void BKE_id_attributes_default_color_set(struct ID *id, std::optional<blender::StringRef> name);
 
-const struct CustomDataLayer *BKE_id_attributes_color_find(const struct ID *id,
-                                                           blender::StringRef name);
-bool BKE_color_attribute_supported(const struct Mesh &mesh, blender::StringRef name);
+bool BKE_id_attributes_color_find(const struct ID *id, blender::StringRef name);
 
 std::string BKE_attribute_calc_unique_name(const AttributeOwner &owner, blender::StringRef name);
 

source/blender/blenkernel/BKE_attribute_legacy_convert.hh

@@ -57,4 +57,17 @@ void pointcloud_convert_customdata_to_storage(PointCloud &pointcloud);
 /** See #mesh_convert_customdata_to_storage. */
 void grease_pencil_convert_customdata_to_storage(GreasePencil &grease_pencil);
 
+/** Abstraction for copying #CustomData layers and #AttributeStorage attributes. */
+class LegacyMeshInterpolator {
+
+  const CustomData &cd_src_;
+  CustomData &cd_dst_;
+
+ public:
+  LegacyMeshInterpolator(const Mesh &src, Mesh &dst, AttrDomain domain);
+
+  void copy(int src_index, int dst_index, int count) const;
+  void mix(Span<int> src_indices, std::optional<Span<float>> weights, int dst_index) const;
+};
+
 }  // namespace blender::bke

source/blender/blenkernel/BKE_context.hh

@@ -256,7 +256,7 @@ const char *CTX_wm_operator_poll_msg_get(bContext *C, bool *r_free);
  *
  * \note even though the function name suggests this is limited to situations
  * when the poll function returns false, this is not the case. Even when the
- * operator is disabled because it is added to a disabled uiLayout, this message
+ * operator is disabled because it is added to a disabled blender::ui::Layout, this message
  * will show.
  */
 void CTX_wm_operator_poll_msg_set(bContext *C, const char *msg);

source/blender/blenkernel/BKE_mesh.hh

@@ -473,6 +473,12 @@ bool mesh_is_valid(const Mesh &mesh, bool verbose = true);
  */
 bool mesh_validate_material_indices(Mesh &mesh);
 
+/**
+ * Check whether faces contain duplicate vertex indices.
+ * \return a mask of all invalid faces.
+ */
+IndexMask mesh_find_faces_duplicate_verts(const Mesh &mesh, IndexMaskMemory &memory);
+
 void mesh_apply_spatial_organization(Mesh &mesh);
 const AttributeAccessorFunctions &mesh_attribute_accessor_functions();
 

source/blender/blenkernel/BKE_node.hh

@@ -53,7 +53,6 @@ struct bNodeSocket;
 struct bNodeStack;
 struct bNodeTree;
 struct bNodeTreeExec;
-struct uiLayout;
 
 namespace blender {
 class CPPType;
@@ -78,6 +77,10 @@ namespace compositor {
 class Context;
 class NodeOperation;
 }  // namespace compositor
+
+namespace ui {
+struct Layout;
+}  // namespace ui
 }  // namespace blender
 
 namespace blender::bke {
@@ -164,7 +167,7 @@ struct bNodeSocketType {
   std::string subtype_label;
 
   void (*draw)(bContext *C,
-               uiLayout *layout,
+               ui::Layout *layout,
                PointerRNA *ptr,
                PointerRNA *node_ptr,
                StringRef text) = nullptr;
@@ -174,7 +177,7 @@ struct bNodeSocketType {
   void (*interface_draw)(ID *id,
                          bNodeTreeInterfaceSocket *socket,
                          bContext *C,
-                         uiLayout *layout) = nullptr;
+                         ui::Layout *layout) = nullptr;
   void (*interface_init_socket)(ID *id,
                                 const bNodeTreeInterfaceSocket *interface_socket,
                                 bNode *node,
@@ -256,9 +259,9 @@ struct bNodeType {
   std::string storagename; /* struct name for DNA */
 
   /* Draw the option buttons on the node */
-  void (*draw_buttons)(uiLayout *, bContext *C, PointerRNA *ptr) = nullptr;
+  void (*draw_buttons)(ui::Layout *, bContext *C, PointerRNA *ptr) = nullptr;
   /* Additional parameters in the side panel */
-  void (*draw_buttons_ex)(uiLayout *, bContext *C, PointerRNA *ptr) = nullptr;
+  void (*draw_buttons_ex)(ui::Layout *, bContext *C, PointerRNA *ptr) = nullptr;
 
   /* Additional drawing on backdrop */
   void (*draw_backdrop)(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y) = nullptr;

source/blender/blenkernel/BKE_screen.hh

@@ -31,6 +31,10 @@ namespace blender::asset_system {
 class AssetRepresentation;
 }
 
+namespace blender::ui {
+struct Layout;
+}  // namespace blender::ui
+
 struct ARegion;
 struct AssetShelfType;
 struct BlendDataReader;
@@ -55,7 +59,6 @@ struct WorkSpace;
 struct bContext;
 struct bScreen;
 struct uiBlock;
-struct uiLayout;
 struct uiList;
 struct wmDrawBuffer;
 struct wmGizmoMap;
@@ -410,8 +413,8 @@ struct LayoutPanelBody {
 };
 
 /**
- * "Layout Panels" are panels which are defined as part of the #uiLayout. As such they have a
- * specific place in the layout and can not be freely dragged around like top level panels.
+ * "Layout Panels" are panels which are defined as part of the #blender::ui::Layout. As such they
+ * have a specific place in the layout and can not be freely dragged around like top level panels.
  *
  * This struct gathers information about the layout panels created by layout code. This is then
  * used for example drawing the backdrop of nested panels and to support opening and closing
@@ -523,7 +526,7 @@ struct ARegionRuntime {
 /** Draw an item in the `ui_list`. */
 using uiListDrawItemFunc = void (*)(uiList *ui_list,
                                     const bContext *C,
-                                    uiLayout *layout,
+                                    blender::ui::Layout *layout,
                                     PointerRNA *dataptr,
                                     PointerRNA *itemptr,
                                     int icon,
@@ -533,7 +536,9 @@ using uiListDrawItemFunc = void (*)(uiList *ui_list,
                                     int flt_flag);
 
 /** Draw the filtering part of an uiList. */
-using uiListDrawFilterFunc = void (*)(uiList *ui_list, const bContext *C, uiLayout *layout);
+using uiListDrawFilterFunc = void (*)(uiList *ui_list,
+                                      const bContext *C,
+                                      blender::ui::Layout *layout);
 
 /** Filter items of an uiList. */
 using uiListFilterItemsFunc = void (*)(uiList *ui_list,
@@ -582,7 +587,7 @@ struct Header {
   /** Runtime. */
   HeaderType *type;
   /** Runtime for drawing. */
-  uiLayout *layout;
+  blender::ui::Layout *layout;
 };
 
 /* Menu types. */
@@ -628,7 +633,7 @@ struct Menu {
   /** Runtime. */
   MenuType *type;
   /** Runtime for drawing. */
-  uiLayout *layout;
+  blender::ui::Layout *layout;
 };
 
 /* Asset shelf types. */
@@ -682,7 +687,7 @@ struct AssetShelfType {
   void (*draw_context_menu)(const bContext *C,
                             const AssetShelfType *shelf_type,
                             const blender::asset_system::AssetRepresentation *asset,
-                            uiLayout *layout);
+                            blender::ui::Layout *layout);
 
   const AssetWeakReference *(*get_active_asset)(const AssetShelfType *shelf_type);