svn merge ^/trunk/blender -r49263:49280
authorCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2012 10:27:28 +0000 (10:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2012 10:27:28 +0000 (10:27 +0000)
16 files changed:
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/include/ED_clip.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c

Simple merge
index 58f6b9f8bd8c57f681f67393bb034360a74f9b26,d650ea7b61dd0382e7f88ace604216f1cb7c4410..d0629b354db9d099a86f76daa5b7b2bfe7c928b3
@@@ -1425,10 -1408,8 +1425,9 @@@ static void draw_distortion(SpaceClip *
        glPopMatrix();
  }
  
- void clip_draw_main(const bContext *C, ARegion *ar)
+ void clip_draw_main(const bContext *C, SpaceClip *sc, ARegion *ar)
  {
-       SpaceClip *sc = CTX_wm_space_clip(C);
 +      wmWindow *win = CTX_wm_window(C);
        MovieClip *clip = ED_space_clip_get_clip(sc);
        Scene *scene = CTX_data_scene(C);
        ImBuf *ibuf;