archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge with trunk r37757.

Browse Source
This commit is contained in:
Joerg Mueller
2011-06-23 17:30:56 +00:00
parent cc246eaca7 e7c6b535b0
commit 413bc87e4f
30 changed files with 278 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_graph/graph_edit.c
View File

@@ -37,7 +37,9 @@
#include <string.h>
#include <float.h>
#include "AUD_C-API.h"
#ifdef WITH_AUDASPACE
# include "AUD_C-API.h"
#endif
#include "MEM_guardedalloc.h"
@@ -1079,6 +1081,7 @@ static float fcurve_samplingcb_sound (FCurve *UNUSED(fcu), void *data, float eva
/* ------------------- */
#ifdef WITH_AUDASPACE
static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op)
{
bAnimContext ac;
@@ -1149,6 +1152,17 @@ static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
#else //WITH_AUDASPACE
static int graphkeys_sound_bake_exec(bContext *UNUSED(C), wmOperator *op)
{
BKE_report(op->reports, RPT_ERROR, "Compiled without sound support");
return OPERATOR_CANCELLED;
}
#endif //WITH_AUDASPACE
static int graphkeys_sound_bake_invoke (bContext *C, wmOperator *op, wmEvent *event)
{
bAnimContext ac;