diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
| commit | 65668dc5eb45ae6e90675aecc9dd6132dc7f0b5e (patch) | |
| tree | 355f3b4dd6f28dc0debf249d1c85a6474784dcfe /source/blender/makesrna/intern/rna_action.c | |
| parent | 16702c172939a399ddd0e61fc14a8b0944c4249b (diff) | |
| parent | 15bd96efeb77cf33215613a53059f01db7242b31 (diff) | |
Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_action.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index f1b57003eec..6d83873bd2c 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -95,15 +95,15 @@ static void rna_Action_groups_remove(bAction *act, ReportList *reports, bActionG static FCurve *rna_Action_fcurve_new(bAction *act, ReportList *reports, const char *data_path, int index, const char *group) { - if(group && group[0]=='\0') group= NULL; + if (group && group[0]=='\0') group= NULL; - if(data_path[0] == '\0') { + if (data_path[0] == '\0') { BKE_report(reports, RPT_ERROR, "F-Curve data path empty, invalid argument"); return NULL; } /* annoying, check if this exists */ - if(verify_fcurve(act, group, data_path, index, 0)) { + if (verify_fcurve(act, group, data_path, index, 0)) { BKE_reportf(reports, RPT_ERROR, "F-Curve '%s[%d]' already exists in action '%s'", data_path, index, act->id.name+2); return NULL; } |