diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-16 16:00:03 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-16 16:00:03 +0400 |
| commit | b937a4f5b6adc6bc0dca62cb5c87db08c873cfba (patch) | |
| tree | f489aca8e10e2a686fc1d1397397f99e1e1f2077 /source/blender/makesrna/intern/rna_internal.h | |
| parent | 3de22dec26606c2c526f7193db038fa5125f9b03 (diff) | |
| parent | f227c4a064d96909243b4a60a7f6c544f521817a (diff) | |
Merge with trunk r37546
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index ae3dd260f64..805f9639ab1 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -188,7 +188,7 @@ void rna_def_animviz_common(struct StructRNA *srna); void rna_def_motionpath_common(struct StructRNA *srna); void rna_def_texmat_common(struct StructRNA *srna, const char *texspace_editable); -void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna, const char *begin, const char *activeget, const char *activeset, const char *structname, const char *structname_slots, const char *update); +void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna, const char *begin, const char *activeget, const char *activeset, const char *activeeditable, const char *structname, const char *structname_slots, const char *update); void rna_def_render_layer_common(struct StructRNA *srna, int scene); void rna_ID_name_get(struct PointerRNA *ptr, char *value); |