diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
| commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
| tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /source/blender/blenloader/intern/versioning_250.c | |
| parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
| parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/blenloader/intern/versioning_250.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index ba4dc2d33c7..72013bc6eed 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -67,7 +67,6 @@ #include "BKE_global.h" // for G #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_particle.h" @@ -1697,7 +1696,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) /* will have no effect */ if (brush->alpha == 0) { - brush->alpha = 0.5f; + brush->alpha = 1.0f; } /* bad radius */ |