svn merge ^/trunk/blender -r47070:47099
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 May 2012 04:48:42 +0000 (04:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 May 2012 04:48:42 +0000 (04:48 +0000)
13 files changed:
1  2 
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_nodetree.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

@@@ -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;
        }
  }
  
Simple merge
Simple merge