Merge branch 'blender-v2.83-release'

2 files changed, 45 insertions, 6 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 10de192277b..382459993b7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -86,6 +86,12 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree,
 {
   bNodeSocket *sock = BLI_findstring(&node->outputs, name, offsetof(bNodeSocket, name));
 
+  /* Replace if types don't match. */
+  if (sock && sock->type != type) {
+    nodeRemoveSocket(ntree, node, sock);
+    sock = NULL;
+  }
+
   /* Create socket if it doesn't exist yet. */
   if (sock == NULL) {
     if (rres_index >= 0) {
diff --git a/source/creator/blender.map b/source/creator/blender.map
index fda6c37b10d..7720ad2b56c 100644
--- a/source/creator/blender.map
+++ b/source/creator/blender.map
@@ -18,14 +18,12 @@ local:
   *cineon*;
   *COLLADA*;
   cu*;
-  decodeInstruction;
   *default_error_condition*;
   *dpx*;
   *embree*;
   ff_*;
   fftw*;
   FLAC*;
-  ForceStackAlign;
   FT_*;
   *GeneratedSaxParser*;
   *google*;
@@ -40,14 +38,11 @@ local:
   jack_*;
   jpeg_*;
   jsimd**;
-  _Jv_RegisterClasses;
   lame_*;
   *llvm*;
   *LLVM*;
   *MathML*;
   *mkldnn*;
-  Name;
-  NumNamedVarArgParams;
   oc_*;
   ogg*;
   *oidn*;
@@ -72,8 +67,46 @@ local:
   vp9*;
   vpx*;
   x264_*;
-  X86CompilationCallback*;
   xml*;
   xvid*;
   *YAML*;
+
+  /* LLVM symbols not in the LLVM namespace that can conflict with LLVM usage
+   * in OpenGL and OpenCL drivers. */
+  decodeInstruction;
+  EnableHotColdSplit;
+  EnableIPRA;
+  EnableOrderFileInstrumentation;
+  EnableVPlanNativePath;
+  EnableVPlanPredication;
+  FlattenedProfileUsed;
+  ForceStackAlign;
+  ForceSummaryEdgesCold;
+  FSEC;
+  __jit_debug_descriptor;
+  __jit_debug_register_code;
+  _Jv_RegisterClasses;
+  MachineRegionInfoPassID;
+  MemOPSizeLarge;
+  MemOPSizeRange;
+  MISchedPostRA;
+  ModuleSummaryDotFile;
+  __morestack;
+  Name;
+  NumNamedVarArgParams;
+  PGOViewCounts;
+  PrintBlockFreqFuncName;
+  PrintBranchProbFuncName;
+  ProfileLikelyProb;
+  StartAfterOptName;
+  StartBeforeOptName;
+  StaticLikelyProb;
+  StopAfterOptName;
+  StopBeforeOptName;
+  UseDbgAddr;
+  ViewBlockFreqFuncName;
+  ViewBlockLayoutWithBFI;
+  ViewHotFreqPercent;
+  WriteRelBFToSummary;
+  X86CompilationCallback*;
 };