Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-06 16:07:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-06 16:10:04 +0300
commit92094c76a949fb9ad9f85ea09aa1f518b402a916 (patch)
tree25ceb40034df4564c6c54f2ac30ebcb6329ce648 /source/blender/blenkernel
parentebcea3029d8ffa893431620947caf7e16e6fb8e9 (diff)
DNA: remove none particle brush & deprecated flags
The none brush doesn't make sense to have anymore with the tool system. Also remove deprecated flags & types for object, armature & text.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_blender_version.h2
-rw-r--r--source/blender/blenkernel/intern/scene.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index a49081c5caa..e82efac3891 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -24,7 +24,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 280
-#define BLENDER_SUBVERSION 46
+#define BLENDER_SUBVERSION 47
/* Several breakages with 280, e.g. collections vs layers */
#define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index c73c6ef6ac2..6567f98b520 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -729,7 +729,7 @@ void BKE_scene_init(Scene *sce)
pset->emitterdist = 0.25f;
pset->totrekey = 5;
pset->totaddkey = 5;
- pset->brushtype = PE_BRUSH_NONE;
+ pset->brushtype = PE_BRUSH_COMB;
pset->draw_step = 2;
pset->fade_frames = 2;
pset->selectmode = SCE_SELECT_PATH;