svn merge ^/trunk/blender -r47070:47099

diff --cc source/blender/blenkernel/intern/context.c
Simple merge

diff --cc source/blender/blenkernel/intern/depsgraph.c
Simple merge

diff --cc source/blender/blenkernel/intern/library.c
Simple merge

diff --cc source/blender/blenkernel/intern/scene.c
Simple merge

diff --cc source/blender/editors/gpencil/gpencil_paint.c
Simple merge

diff --cc source/blender/editors/interface/interface_templates.c
Simple merge

diff --cc source/blender/editors/space_node/drawnode.c
index 5c2b021c0558e87b0664814cb7e4ecf291eb4da5,c6a652921fddc5a0c97c41023dd175e6efe6cbea..3c070b4e63790ff30320f41f39816de119b3bd89
--- 1/source/blender/editors/space_node/drawnode.c
--- 2/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -2580,15 -2575,12 +2580,15 @@@ static void node_composit_set_butfunc(b
                        break;
                case CMP_NODE_VIEWER:
                        ntype->uifunc = NULL;
-                       ntype->uifuncbut= node_composit_buts_viewer_but;
+                       ntype->uifuncbut = node_composit_buts_viewer_but;
                        ntype->uibackdropfunc = node_composit_backdrop_viewer;
                        break;
 +              case CMP_NODE_MASK:
 +                      ntype->uifunc= node_composit_buts_mask;
 +                      break;
  
                default:
-                       ntype->uifunc= NULL;
+                       ntype->uifunc = NULL;
        }
  }
  

diff --cc source/blender/makesdna/intern/makesdna.c
Simple merge

diff --cc source/blender/makesrna/intern/CMakeLists.txt
Simple merge

diff --cc source/blender/makesrna/intern/makesrna.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_nodetree.c
Simple merge

diff --cc source/blenderplayer/CMakeLists.txt
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge