Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-06-16 04:52:21 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-06-16 04:52:21 +0400
commit51fbc95e8c8699cd9ba2f7b1958df7270851af39 (patch)
tree3e2f2ce8595f38d79116ff1026a6995dc373b092 /source/blender/editors/space_sequencer
parent32cf82dbb394fa454a2bc0b93d166d1091b3c25e (diff)
RNA
* Added icon to property and enum property items. The latter is responsible for the large number of files changed. * For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA as argument instead of a C pointer, instead of doing it implicitly with the AnyType type. * Material: properly wrap diffuse/specular param variables, and rename some things for consistency. * MaterialTextureSlot: added "enabled" property (ma->septex). * Image: make animated property editable. * Image Editor: make some things editable, notifiers, respect state. * Context: fix issue with screen not being set as ID.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 20ad1b61981..7cd81faede1 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -105,35 +105,35 @@ static int okee() {return 0;}
/* XXX */
/* RNA Enums, used in multiple files */
EnumPropertyItem sequencer_prop_effect_types[] = {
- {SEQ_CROSS, "CROSS", "Crossfade", "Crossfade effect strip type"},
- {SEQ_ADD, "ADD", "Add", "Add effect strip type"},
- {SEQ_SUB, "SUBTRACT", "Subtract", "Subtract effect strip type"},
- {SEQ_ALPHAOVER, "ALPHA_OVER", "Alpha Over", "Alpha Over effect strip type"},
- {SEQ_ALPHAUNDER, "ALPHA_UNDER", "Alpha Under", "Alpha Under effect strip type"},
- {SEQ_GAMCROSS, "GAMMA_CROSS", "Gamma Cross", "Gamma Cross effect strip type"},
- {SEQ_MUL, "MULTIPLY", "Multiply", "Multiply effect strip type"},
- {SEQ_OVERDROP, "OVER_DROP", "Alpha Over Drop", "Alpha Over Drop effect strip type"},
- {SEQ_PLUGIN, "PLUGIN", "Plugin", "Plugin effect strip type"},
- {SEQ_WIPE, "WIPE", "Wipe", "Wipe effect strip type"},
- {SEQ_GLOW, "GLOW", "Glow", "Glow effect strip type"},
- {SEQ_TRANSFORM, "TRANSFORM", "Transform", "Transform effect strip type"},
- {SEQ_COLOR, "COLOR", "Color", "Color effect strip type"},
- {SEQ_SPEED, "SPEED", "Speed", "Color effect strip type"},
- {0, NULL, NULL, NULL}
+ {SEQ_CROSS, "CROSS", 0, "Crossfade", "Crossfade effect strip type"},
+ {SEQ_ADD, "ADD", 0, "Add", "Add effect strip type"},
+ {SEQ_SUB, "SUBTRACT", 0, "Subtract", "Subtract effect strip type"},
+ {SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", "Alpha Over effect strip type"},
+ {SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", "Alpha Under effect strip type"},
+ {SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"},
+ {SEQ_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"},
+ {SEQ_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"},
+ {SEQ_PLUGIN, "PLUGIN", 0, "Plugin", "Plugin effect strip type"},
+ {SEQ_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"},
+ {SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"},
+ {SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"},
+ {SEQ_COLOR, "COLOR", 0, "Color", "Color effect strip type"},
+ {SEQ_SPEED, "SPEED", 0, "Speed", "Color effect strip type"},
+ {0, NULL, 0, NULL, NULL}
};
/* mute operator */
EnumPropertyItem sequencer_prop_operate_types[] = { /* better name? */
- {SEQ_SELECTED, "SELECTED", "Selected", ""},
- {SEQ_UNSELECTED, "UNSELECTED", "Unselected ", ""},
- {0, NULL, NULL, NULL}
+ {SEQ_SELECTED, "SELECTED", 0, "Selected", ""},
+ {SEQ_UNSELECTED, "UNSELECTED", 0, "Unselected ", ""},
+ {0, NULL, 0, NULL, NULL}
};
EnumPropertyItem prop_side_types[] = {
- {SEQ_SIDE_LEFT, "LEFT", "Left", ""},
- {SEQ_SIDE_RIGHT, "RIGHT", "Right", ""},
- {SEQ_SIDE_BOTH, "BOTH", "Both", ""},
- {0, NULL, NULL, NULL}
+ {SEQ_SIDE_LEFT, "LEFT", 0, "Left", ""},
+ {SEQ_SIDE_RIGHT, "RIGHT", 0, "Right", ""},
+ {SEQ_SIDE_BOTH, "BOTH", 0, "Both", ""},
+ {0, NULL, 0, NULL, NULL}
};
typedef struct TransSeq {
@@ -1726,9 +1726,9 @@ void SEQUENCER_OT_refresh_all(struct wmOperatorType *ot)
/* cut operator */
static EnumPropertyItem prop_cut_types[] = {
- {SEQ_CUT_SOFT, "SOFT", "Soft", ""},
- {SEQ_CUT_HARD, "HARD", "Hard", ""},
- {0, NULL, NULL, NULL}
+ {SEQ_CUT_SOFT, "SOFT", 0, "Soft", ""},
+ {SEQ_CUT_HARD, "HARD", 0, "Hard", ""},
+ {0, NULL, 0, NULL, NULL}
};
static int sequencer_cut_exec(bContext *C, wmOperator *op)