[Bf-blender-cvs] [8615d81203a] PSketch-279: Fix more merge errors
Joshua Leung
noreply at git.blender.org
Tue May 8 18:02:46 CEST 2018
Commit: 8615d81203af53ee9866af2043b05c06b61462d5
Author: Joshua Leung
Date: Sun Dec 24 01:02:29 2017 +1300
Branches: PSketch-279
https://developer.blender.org/rB8615d81203af53ee9866af2043b05c06b61462d5
Fix more merge errors
===================================================================
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 7e6d6670234..1feb40a5346 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2186,6 +2186,7 @@ classes = (
VIEW3D_PT_tools_latticeedit,
VIEW3D_PT_tools_posemode,
VIEW3D_PT_tools_posemode_options,
+ VIEW3D_PT_tools_posemode_sculpt,
VIEW3D_PT_imapaint_tools_missing,
VIEW3D_PT_tools_brush,
TEXTURE_UL_texpaintslots,
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index db87a93b7bf..3199832cd7a 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -344,66 +344,6 @@ static void do_version_bbone_easing_fcurve_fix(ID *UNUSED(id), FCurve *fcu, void
}
}
}
-
-
- /* Pose Sculpt... */
- if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "PSculptSettings", "psculpt")) {
- Scene *scene;
-
- /* init defaults for pose sculpt settings
- * ! Keep in sync with blenkernel/scene.c - BKE_scene_init()
- * and blenloader/versioning_defaults.c
- */
- for (scene = main->scene.first; scene; scene = scene->id.next) {
- PSculptSettings *psculpt = &scene->toolsettings->psculpt;
-
- //if (psculpt->brush[0].size == 0)
- {
- int i;
-
- for (i = 0; i < PSCULPT_TOT_BRUSH; i++) {
- psculpt->brush[i].strength = 0.5f;
- psculpt->brush[i].size = 50;
- psculpt->brush[i].rate = 0.01f;
- psculpt->brush[i].flag = PSCULPT_BRUSH_FLAG_USE_PRESSURE | PSCULPT_BRUSH_FLAG_USE_FALLOFF;
-
- psculpt->brush[i].bulge = 1.0f;
- psculpt->brush[i].bulge_min = 1.0f;
- psculpt->brush[i].bulge_max = 1.0f;
- }
- psculpt->brush[PSCULPT_BRUSH_SMOOTH].strength = 0.25f;
- psculpt->brush[PSCULPT_BRUSH_GRAB].strength = 1.0f;
- psculpt->brush[PSCULPT_BRUSH_CURL].strength = 0.25f;
- psculpt->brush[PSCULPT_BRUSH_TWIST].strength = 0.25f;
- //psculpt->brush[PSCULPT_BRUSH_RESET].strength = 1.0f;
- psculpt->brush[PSCULPT_BRUSH_CURL].xzMode = PSCULPT_BRUSH_DO_X;
- psculpt->brush[PSCULPT_BRUSH_ADJUST].flag &= ~PSCULPT_BRUSH_FLAG_USE_FALLOFF;
- psculpt->brush[PSCULPT_BRUSH_GRAB].flag |= PSCULPT_BRUSH_FLAG_GRAB_INITIAL;
- psculpt->brush[PSCULPT_BRUSH_STRETCH].flag |= PSCULPT_BRUSH_FLAG_VOL_PRESERVE;
- }
- }
- }
-
- /* Pose Sketching */
- if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "PSketchSettings", "psketch")) {
- Scene *scene;
-
- /* init defaults for pose sculpt settings
- * ! Keep in sync with blenkernel/scene.c - BKE_scene_init()
- * and blenloader/versioning_defaults.c
- */
- for (scene = main->scene.first; scene; scene = scene->id.next) {
- PSketchSettings *psketch = &scene->toolsettings->psketch;
- const float default_psketch_color[4] = {1.0f, 0.9f, 0.4f, 0.9f};
-
- copy_v3_v3(psketch->color, default_psketch_color);
- psketch->color[3] = default_psketch_color[3];
- psketch->thickness = 4;
- strcpy(psketch->layer_name, "PSketch");
-
- psketch->flag = PSKETCH_FLAG_USE_CLOSEST_END_FIRST;
- }
- }
}
@@ -1826,6 +1766,65 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
}
+
+ {
+ /* Pose Sculpt... */
+ if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "PSculptSettings", "psculpt")) {
+ Scene *scene;
+
+ /* init defaults for pose sculpt settings
+ * ! Keep in sync with blenkernel/scene.c - BKE_scene_init()
+ * and blenloader/versioning_defaults.c
+ */
+ for (scene = main->scene.first; scene; scene = scene->id.next) {
+ PSculptSettings *psculpt = &scene->toolsettings->psculpt;
+
+ //if (psculpt->brush[0].size == 0)
+ {
+ int i;
+
+ for (i = 0; i < PSCULPT_TOT_BRUSH; i++) {
+ psculpt->brush[i].strength = 0.5f;
+ psculpt->brush[i].size = 50;
+ psculpt->brush[i].rate = 0.01f;
+ psculpt->brush[i].flag = PSCULPT_BRUSH_FLAG_USE_PRESSURE | PSCULPT_BRUSH_FLAG_USE_FALLOFF;
+
+ psculpt->brush[i].bulge = 1.0f;
+ psculpt->brush[i].bulge_min = 1.0f;
+ psculpt->brush[i].bulge_max = 1.0f;
+ }
+ psculpt->brush[PSCULPT_BRUSH_SMOOTH].strength = 0.25f;
+ psculpt->brush[PSCULPT_BRUSH_GRAB].strength = 1.0f;
+ psculpt->brush[PSCULPT_BRUSH_CURL].strength = 0.25f;
+ psculpt->brush[PSCULPT_BRUSH_TWIST].strength = 0.25f;
+ //psculpt->brush[PSCULPT_BRUSH_RESET].strength = 1.0f;
+ psculpt->brush[PSCULPT_BRUSH_CURL].xzMode = PSCULPT_BRUSH_DO_X;
+ psculpt->brush[PSCULPT_BRUSH_ADJUST].flag &= ~PSCULPT_BRUSH_FLAG_USE_FALLOFF;
+ psculpt->brush[PSCULPT_BRUSH_GRAB].flag |= PSCULPT_BRUSH_FLAG_GRAB_INITIAL;
+ psculpt->brush[PSCULPT_BRUSH_STRETCH].flag |= PSCULPT_BRUSH_FLAG_VOL_PRESERVE;
+ }
+ }
+ }
+
+ /* Pose Sketching */
+ if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "PSketchSettings", "psketch")) {
+ /* init defaults for pose sculpt settings
+ * ! Keep in sync with blenkernel/scene.c - BKE_scene_init()
+ * and blenloader/versioning_defaults.c
+ */
+ for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ PSketchSettings *psketch = &scene->toolsettings->psketch;
+ const float default_psketch_color[4] = {1.0f, 0.9f, 0.4f, 0.9f};
+
+ copy_v3_v3(psketch->color, default_psketch_color);
+ psketch->color[3] = default_psketch_color[3];
+ psketch->thickness = 4;
+ strcpy(psketch->layer_name, "PSketch");
+
+ psketch->flag = PSKETCH_FLAG_USE_CLOSEST_END_FIRST;
+ }
+ }
+ }
}
void do_versions_after_linking_270(Main *main)
More information about the Bf-blender-cvs
mailing list