Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / sound / sound_ops.c
index b91ac3c..049feea 100644 (file)
@@ -67,7 +67,7 @@
 #include "WM_types.h"
 
 #ifdef WITH_AUDASPACE
-#  include AUD_SPECIAL_H
+#  include <AUD_Special.h>
 #endif
 
 #include "ED_sound.h"
@@ -311,6 +311,7 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op))
 {
        Main *bmain = CTX_data_main(C);
        Scene *scene = CTX_data_scene(C);
+       struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
        int oldfra = scene->r.cfra;
        int cfra;
 
@@ -318,11 +319,11 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op))
 
        for (cfra = (scene->r.sfra > 0) ? (scene->r.sfra - 1) : 0; cfra <= scene->r.efra + 1; cfra++) {
                scene->r.cfra = cfra;
-               BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, scene->lay);
+               BKE_scene_graph_update_for_newframe(depsgraph, bmain);
        }
 
        scene->r.cfra = oldfra;
-       BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, scene->lay);
+       BKE_scene_graph_update_for_newframe(depsgraph, bmain);
 
        return OPERATOR_FINISHED;
 }
@@ -634,7 +635,7 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
        RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
 
        /* main draw call */
-       uiDefAutoButsRNA(layout, &ptr, sound_mixdown_draw_check_prop, '\0');
+       uiDefAutoButsRNA(layout, &ptr, sound_mixdown_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false);
 }
 #endif // WITH_AUDASPACE