diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-17 22:07:40 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-17 22:07:40 +0400 |
commit | 6aeb2f687ae1d41715351ef265a0e0a9af06121a (patch) | |
tree | ec35ddafb03209d326c426f02b86b74db8cbc12e /source/blender | |
parent | e19e654d84ccb697941586df74a42cf3bd13ca96 (diff) |
- rna sequence sound was referencing unknown struct
- cmake was using libs that were disabled (whitespace changes too)
- unit conversion missing checks for % ~ & operators
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/unit.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequence.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index e56d8f173e5..f8e3b3c5ad2 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -317,11 +317,14 @@ static int ch_is_op(char op) case '*': case '/': case '|': + case '&': + case '~': case '<': case '>': case '^': case '!': case '=': + case '%': return 1; default: return 0; diff --git a/source/blender/makesrna/intern/rna_sequence.c b/source/blender/makesrna/intern/rna_sequence.c index 06f9972d93f..71f5b480061 100644 --- a/source/blender/makesrna/intern/rna_sequence.c +++ b/source/blender/makesrna/intern/rna_sequence.c @@ -742,7 +742,7 @@ static void rna_def_sound(BlenderRNA *brna) RNA_def_struct_sdna(srna, "Sequence"); prop= RNA_def_property(srna, "sound", PROP_POINTER, PROP_NONE); - RNA_def_property_struct_type(prop, "UnknownType"); + RNA_def_property_struct_type(prop, "Sound"); RNA_def_property_ui_text(prop, "Sound", "Sound datablock used by this sequence (RAM audio only)."); prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH); |