Merging r50049 through r50076 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_node / space_node.c
index 0dcd657326179dc747c6c05b90dfb90f190022b0..fbe282915000c8cc5ec2c941c7fd1842fd9bcf05 100644 (file)
@@ -47,7 +47,7 @@
 
 #include "ED_render.h"
 #include "ED_screen.h"
 
 #include "ED_render.h"
 #include "ED_screen.h"
-
+#include "ED_node.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -292,8 +292,9 @@ static void node_area_refresh(const struct bContext *C, ScrArea *sa)
                                        snode->recalc = 0;
                                        node_render_changed_exec((struct bContext *)C, NULL);
                                }
                                        snode->recalc = 0;
                                        node_render_changed_exec((struct bContext *)C, NULL);
                                }
-                               else
-                                       snode_composite_job(C, sa);
+                               else {
+                                       ED_node_composite_job(C, snode->nodetree, scene);
+                               }
                        }
                }
                else if (snode->treetype == NTREE_TEXTURE) {
                        }
                }
                else if (snode->treetype == NTREE_TEXTURE) {
@@ -342,7 +343,7 @@ static void node_cursor(wmWindow *win, ScrArea *sa, ARegion *ar)
 
        /* convert mouse coordinates to v2d space */
        UI_view2d_region_to_view(&ar->v2d, win->eventstate->x - ar->winrct.xmin, win->eventstate->y - ar->winrct.ymin,
 
        /* convert mouse coordinates to v2d space */
        UI_view2d_region_to_view(&ar->v2d, win->eventstate->x - ar->winrct.xmin, win->eventstate->y - ar->winrct.ymin,
-                                &snode->mx, &snode->my);
+                                &snode->cursor[0], &snode->cursor[1]);
 
        node_set_cursor(win, snode);
 }
 
        node_set_cursor(win, snode);
 }