diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
commit | b308e613126f8c89e954705aa512a3ef6a1f551d (patch) | |
tree | 4a875450b2ba9766fbdf4914e8cb003e8132497c /source/blender/editors/space_graph/graph_edit.c | |
parent | 98bdf0274b1052efe25b6216f488d2a40fa43d1c (diff) | |
parent | cda5d1769d71832a6b04ed6c91bac101c482e5f7 (diff) |
svn merge ^/trunk/blender -r43220:43278 --accept postpone
Diffstat (limited to 'source/blender/editors/space_graph/graph_edit.c')
-rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 460e46fce30..24b2dc9e41c 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -1046,6 +1046,8 @@ void GRAPH_OT_bake (wmOperatorType *ot) // todo: add props for start/end frames } +#ifdef WITH_AUDASPACE + /* ******************** Sound Bake F-Curve Operator *********************** */ /* This operator bakes the given sound to the selected F-Curves */ @@ -1078,7 +1080,6 @@ 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; |