4.2 Merge fixes

source/blender/blenkernel/BKE_node.hh

@@ -967,6 +967,15 @@ void BKE_nodetree_remove_layer_n(bNodeTree *ntree, Scene *scene, int layer_index
 #define SH_NODE_MIX 713
 #define SH_NODE_BSDF_RAY_PORTAL 714
 
+#define SH_NODE_SHADER_INFO 800
+#define SH_NODE_SCREENSPACE_INFO 801
+#define SH_NODE_SDF_PRIMITIVE 802
+#define SH_NODE_SDF_OP 803
+#define SH_NODE_SDF_VECTOR_OP 804
+#define SH_NODE_SDF_NOISE 805
+#define SH_NODE_SET_DEPTH 806
+#define SH_NODE_CURVATURE 807
+
 /** \} */
 
 /* -------------------------------------------------------------------- */

source/blender/compositor/operations/COM_FlipOperation.cc

@@ -28,34 +28,6 @@ void FlipOperation::get_area_of_interest(const int input_idx,
   r_input_area = get_canvas();
 }
 
-bool FlipOperation::determine_depending_area_of_interest(rcti *input,
-                                                         ReadBufferOperation *read_operation,
-                                                         rcti *output)
-{
-  rcti new_input;
-
-  if (flip_x_) {
-    const int w = int(this->get_width()) - 1;
-    new_input.xmax = (w - input->xmin) + 1;
-    new_input.xmin = (w - input->xmax) - 1;
-  }
-  else {
-    new_input.xmin = input->xmin;
-    new_input.xmax = input->xmax;
-  }
-  if (flip_y_) {
-    const int h = int(this->get_height()) - 1;
-    new_input.ymax = (h - input->ymin) + 1;
-    new_input.ymin = (h - input->ymax) - 1;
-  }
-  else {
-    new_input.ymin = input->ymin;
-    new_input.ymax = input->ymax;
-  }
-
-  return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output);
-}
-
 void FlipOperation::update_memory_buffer_partial(MemoryBuffer *output,
                                                  const rcti &area,
                                                  Span<MemoryBuffer *> inputs)

source/blender/editors/object/object_intern.hh

@@ -271,6 +271,7 @@ void POSE_OT_constraint_add_with_targets(wmOperatorType *ot);
 
 void OBJECT_OT_constraints_copy(wmOperatorType *ot);
 void POSE_OT_constraints_copy(wmOperatorType *ot);
+void POSE_OT_constraints_merge(struct wmOperatorType *ot);
 
 void OBJECT_OT_constraints_clear(wmOperatorType *ot);
 void POSE_OT_constraints_clear(wmOperatorType *ot);

source/blender/editors/space_outliner/outliner_collections.cc

@@ -193,18 +193,6 @@ static bool collection_new_poll(bContext *C)
   }
   return true;
 }
-
-static bool collection_new_poll(bContext *C)
-{
-  if (!ED_operator_region_outliner_active(C)) {
-    return false;
-  }
-  if (!collection_edit_in_active_scene_poll(C)) {
-    return false;
-  }
-  return true;
-}
-
 /** \} */
 
 /* -------------------------------------------------------------------- */

source/blender/makesdna/DNA_userdef_types.h

@@ -760,6 +760,7 @@ typedef struct UserDef_Experimental {
 
   char use_grease_pencil_version3_convert_on_load;
   char use_animation_baklava;
+  char _pad[7];
   /** `makesdna` does not allow empty structs. */
 } UserDef_Experimental;