Merging r49534 through r49573 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 5 Aug 2012 12:54:39 +0000 (12:54 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 5 Aug 2012 12:54:39 +0000 (12:54 +0000)
14 files changed:
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_image.py
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/space_node.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge
@@@ -120,10 -120,10 +120,10 @@@ void NODE_OT_backimage_sample(wmOperato
  
  /* drawnode.c */
  void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link);
- void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 );
- int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, float coord_array[][2], int resol);
+ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3);
+ int node_link_bezier_points(View2D * v2d, SpaceNode * snode, bNodeLink * link, float coord_array[][2], int resol);
  // void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 );
 -void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode, int color_manage);
 +void draw_nodespace_back_pix(const struct bContext *C, ARegion *ar, SpaceNode *snode);
  
  
  /* node_add.c */
Simple merge