diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-16 04:52:21 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-16 04:52:21 +0400 |
| commit | 51fbc95e8c8699cd9ba2f7b1958df7270851af39 (patch) | |
| tree | 3e2f2ce8595f38d79116ff1026a6995dc373b092 /source/blender/makesrna/intern/rna_controller.c | |
| parent | 32cf82dbb394fa454a2bc0b93d166d1091b3c25e (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/makesrna/intern/rna_controller.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_controller.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index df603e7920f..4d5ef7aa123 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -66,15 +66,15 @@ void RNA_def_controller(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; static EnumPropertyItem controller_type_items[] ={ - {CONT_LOGIC_AND, "LOGIC_AND", "Logic And", ""}, - {CONT_LOGIC_OR, "LOGIC_OR", "Logic Or", ""}, - {CONT_LOGIC_NAND, "LOGIC_NAND", "Logic Nand", ""}, - {CONT_LOGIC_NOR, "LOGIC_NOR", "Logic Nor", ""}, - {CONT_LOGIC_XOR, "LOGIC_XOR", "Logic Xor", ""}, - {CONT_LOGIC_XNOR, "LOGIC_XNOR", "Logic Xnor", ""}, - {CONT_EXPRESSION, "EXPRESSION", "Expression", ""}, - {CONT_PYTHON, "PYTHON", "Python Script", ""}, - {0, NULL, NULL, NULL}}; + {CONT_LOGIC_AND, "LOGIC_AND", 0, "Logic And", ""}, + {CONT_LOGIC_OR, "LOGIC_OR", 0, "Logic Or", ""}, + {CONT_LOGIC_NAND, "LOGIC_NAND", 0, "Logic Nand", ""}, + {CONT_LOGIC_NOR, "LOGIC_NOR", 0, "Logic Nor", ""}, + {CONT_LOGIC_XOR, "LOGIC_XOR", 0, "Logic Xor", ""}, + {CONT_LOGIC_XNOR, "LOGIC_XNOR", 0, "Logic Xnor", ""}, + {CONT_EXPRESSION, "EXPRESSION", 0, "Expression", ""}, + {CONT_PYTHON, "PYTHON", 0, "Python Script", ""}, + {0, NULL, 0, NULL, NULL}}; /* Controller */ srna= RNA_def_struct(brna, "Controller", NULL); |