Commit: 00f2700b75128bee352572d6f34e096b5c26ddab
Author: Pablo Dobarro
Date: Mon Mar 18 17:30:19 2019 +0100
Branches: sculpt-mode-features
https://developer.blender.org/rB00f2700b75128bee352572d6f34e096b5c26ddab
Merge branch 'master' into sculpt-mode-features
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_280.c
index c46b8fa2518,986f35008bd..47a69ff7f63
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2892,16 -2897,28 +2897,35 @@@ void blo_do_versions_280(FileData *fd,
"Filmic");
}
}
+
+ Brush *br;
+ for (br = bmain->brushes.first; br; br = br->id.next) {
+ if (br->ob_mode & OB_MODE_SCULPT) {
+ br->normal_radius_factor = 0.2f;
+ }
+ }
}
+ if (!MAIN_VERSION_ATLEAST(bmain, 280, 49)) {
+ /* All tool names changed, reset to defaults. */
+ for (WorkSpace *workspace = bmain->workspaces.first; workspace;
workspace = workspace->id.next) {
+ while (!BLI_listbase_is_empty(&workspace->tools)) {
+ BKE_workspace_tool_remove(workspace,
workspace->tools.first);
+ }
+ }
+ }
+
{
/* Versioning code until next subversion bump goes here. */
+
+ LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) {
+ /* Replace deprecated PART_DRAW_BB by PART_DRAW_NOT */
+ if (part->ren_as == PART_DRAW_BB) {
+ part->ren_as = PART_DRAW_NOT;
+ }
+ if (part->draw_as == PART_DRAW_BB) {
+ part->draw_as = PART_DRAW_NOT;
+ }
+ }
}
}
diff --cc source/blender/editors/object/object_edit.c
index aacd694f530,1964cd53cc7..7a807206bda
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -78,9 -77,8 +78,10 @@@
#include "BKE_softbody.h"
#include "BKE_editmesh.h"
#include "BKE_report.h"
+ #include "BKE_scene.h"
#include "BKE_workspace.h"
+#include "BKE_mesh_runtime.h"
+#include "BKE_library.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --cc source/blender/makesdna/DNA_userdef_types.h
index 5950ceac41b,1da28b4aa2d..6d4a4158f87
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -894,15 -897,21 +897,22 @@@ typedef enum eUserpref_UI_Flag
USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31),
} eUserpref_UI_Flag;
- /** #UserDef.uiflag2 */
+ /** #UserDef.uiflag2
+ *
+ * \note don't add new flags here, use 'uiflag' which has flags free. */
typedef enum eUserpref_UI_Flag2 {
- USER_UIFLAG2_DEPRECATED_0 = (1 << 0),
- USER_REGION_OVERLAP = (1 << 1),
- USER_TRACKPAD_NATURAL = (1 << 2),
- USER_EDIT_MODE_SMOOTH_WIRE = (1 << 3),
- USER_2D_VIEWPORT_PANNING = (1 << 4),
- USER_UIFLAG2_UNUSED_0 = (1 << 0), /* cleared */
++ USER_UIFLAG2_UNUSED_0 = (1 << 0),
+ USER_REGION_OVERLAP = (1 << 1),
+ USER_TRACKPAD_NATURAL = (1 << 2),
- USER_UIFLAG2_UNUSED_3 = (1 << 3), /* dirty */
++ USER_UIFLAG2_UNUSED_3 = (1 << 3),
++ USER_2D_VIEWPORT_PANNING = (1 << 4),
} eUserpref_UI_Flag2;
+ typedef enum eUserpref_GPU_Flag {
+ USER_GPU_FLAG_NO_DEPT_PICK = (1 << 0),
+ USER_GPU_FLAG_NO_EDIT_MODE_SMOOTH_WIRE = (1 << 1),
+ } eUserpref_GPU_Flag;
+
/** #UserDef.tablet_api */
typedef enum eUserpref_TableAPI {
USER_TABLET_AUTOMATIC = 0,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
