diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:58:27 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:59:26 +0300 |
| commit | 24d29f2e500771257cc962e899630edaccb01cfe (patch) | |
| tree | 600780f0dab7f3efe5477eb24d59c533bc2abdc6 /source/blender/windowmanager | |
| parent | 11af9e9a5bd1caff1ec46794bda2934a01ce5035 (diff) | |
| parent | 3054e33d67c8f524dae915c8f1f016a7bfa63ab0 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 36b819d3495..729af731dfe 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -435,8 +435,7 @@ void wm_file_read_report(bContext *C) } BKE_reportf(reports, RPT_ERROR, - "Engine '%s' not available for scene '%s' " - "(an addon may need to be installed or enabled)", + "Engine '%s' not available for scene '%s' (an add-on may need to be installed or enabled)", sce->r.engine, sce->id.name + 2); } } |