Merging r49815 through r49833 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_image / image_ops.c
index d85cc307c3ebf937765fc8a98bc75c3eba0e2afc..1d8f63ce385248cf2d223a14f39dcc4dd28dd385 100644 (file)
@@ -581,7 +581,7 @@ static int image_view_all_exec(bContext *C, wmOperator *UNUSED(op))
        w = width * aspx;
        h = height * aspy;
        
-       /* check if the image will fit in the image with zoom==1 */
+       /* check if the image will fit in the image with (zoom == 1) */
        width = ar->winrct.xmax - ar->winrct.xmin + 1;
        height = ar->winrct.ymax - ar->winrct.ymin + 1;
 
@@ -2304,7 +2304,7 @@ static int image_record_composite_apply(bContext *C, wmOperator *op)
        Scene *scene = CTX_data_scene(C);
        ImBuf *ibuf;
        
-       WM_timecursor(CTX_wm_window(C), scene->r.cfra);
+       WM_cursor_time(CTX_wm_window(C), scene->r.cfra);
 
        // XXX scene->nodetree->test_break= blender_test_break;
        // XXX scene->nodetree->test_break= NULL;