diff options
author | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
commit | c689a2ea8c016d3dffda73fc5916ad2717ffc2e1 (patch) | |
tree | b76bacbe6f109671415e1744abb9dadb929a56b1 /source/blender/editors/util/ed_util.c | |
parent | 2c331302773bfbd725c1a9a102b7e637a46a2a2f (diff) | |
parent | 4cf531f7a05434a9bbd6144a7ec0314e60aaff40 (diff) |
Merge remote-tracking branch 'origin/master' into soc-2014-cyclessoc-2014-cycles
Diffstat (limited to 'source/blender/editors/util/ed_util.c')
-rw-r--r-- | source/blender/editors/util/ed_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 47fbfbe3eba..56b12fcdcda 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -86,7 +86,7 @@ void ED_editors_init(bContext *C) /* This is called during initialization, so we don't want to store any reports */ ReportList *reports = CTX_wm_reports(C); - int reports_flag_prev = reports->flag &= ~RPT_STORE; + int reports_flag_prev = reports->flag & ~RPT_STORE; SWAP(int, reports->flag, reports_flag_prev); |