[Bf-blender-cvs] [44e6f5eba71] temp-vse-preview-transform2: Still issues with gizmo drawing...
Richard Antalik
noreply at git.blender.org
Wed Sep 15 17:19:53 CEST 2021
Commit: 44e6f5eba71651718ce9c32a14d3e9363562dd79
Author: Richard Antalik
Date: Thu Sep 9 09:11:56 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rB44e6f5eba71651718ce9c32a14d3e9363562dd79
Still issues with gizmo drawing...
===================================================================
M source/blender/blenloader/intern/versioning_300.c
M source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M source/blender/editors/transform/transform_gizmo_2d.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 31c991cd4d6..0363cc0d2e4 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -631,7 +631,6 @@ static bNodeSocket *do_version_replace_float_size_with_vector(bNodeTree *ntree,
return new_socket;
}
-<<<<<<< HEAD
static bool geometry_node_is_293_legacy(const short node_type)
{
switch (node_type) {
@@ -765,497 +764,494 @@ static void version_geometry_nodes_change_legacy_names(bNodeTree *ntree)
temp_idname + strlen("GeometryNode"));
}
}
+}
+static bool seq_transform_origin_set(Sequence *seq, void *UNUSED(user_data))
+{
+ StripTransform *transform = seq->strip->transform;
+ transform->origin[0] = transform->origin[1] = 0.0f;
+ return true;
+}
- static bool seq_transform_origin_set(Sequence * seq, void *UNUSED(user_data))
- {
- StripTransform *transform = seq->strip->transform;
- transform->origin[0] = transform->origin[1] = 0.0f;
- }
-
- /* NOLINTNEXTLINE: readability-function-size */
- void blo_do_versions_300(FileData * fd, Library * UNUSED(lib), Main * bmain)
- {
- if (!MAIN_VERSION_ATLEAST(bmain, 300, 1)) {
- /* Set default value for the new bisect_threshold parameter in the mirror modifier. */
- if (!DNA_struct_elem_find(fd->filesdna, "MirrorModifierData", "float", "bisect_threshold")) {
- LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
- LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
- if (md->type == eModifierType_Mirror) {
- MirrorModifierData *mmd = (MirrorModifierData *)md;
- /* This was the previous hard-coded value. */
- mmd->bisect_threshold = 0.001f;
- }
+/* NOLINTNEXTLINE: readability-function-size */
+void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
+{
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 1)) {
+ /* Set default value for the new bisect_threshold parameter in the mirror modifier. */
+ if (!DNA_struct_elem_find(fd->filesdna, "MirrorModifierData", "float", "bisect_threshold")) {
+ LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+ LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
+ if (md->type == eModifierType_Mirror) {
+ MirrorModifierData *mmd = (MirrorModifierData *)md;
+ /* This was the previous hard-coded value. */
+ mmd->bisect_threshold = 0.001f;
}
}
}
- /* Grease Pencil: Set default value for dilate pixels. */
- if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "int", "dilate_pixels")) {
- LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
- if (brush->gpencil_settings) {
- brush->gpencil_settings->dilate_pixels = 1;
- }
+ }
+ /* Grease Pencil: Set default value for dilate pixels. */
+ if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "int", "dilate_pixels")) {
+ LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+ if (brush->gpencil_settings) {
+ brush->gpencil_settings->dilate_pixels = 1;
}
}
}
+ }
- if (!MAIN_VERSION_ATLEAST(bmain, 300, 2)) {
- version_switch_node_input_prefix(bmain);
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 2)) {
+ version_switch_node_input_prefix(bmain);
- if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale_xyz[3]")) {
- LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
- if (ob->pose == NULL) {
- continue;
- }
- LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
- copy_v3_fl(pchan->custom_scale_xyz, pchan->custom_scale);
- }
+ if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale_xyz[3]")) {
+ LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+ if (ob->pose == NULL) {
+ continue;
+ }
+ LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
+ copy_v3_fl(pchan->custom_scale_xyz, pchan->custom_scale);
}
}
}
+ }
- if (!MAIN_VERSION_ATLEAST(bmain, 300, 4)) {
- /* Add a properties sidebar to the spreadsheet editor. */
- LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
- LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
- LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
- if (sl->spacetype == SPACE_SPREADSHEET) {
- ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
- &sl->regionbase;
- ARegion *new_sidebar = do_versions_add_region_if_not_found(
- regionbase, RGN_TYPE_UI, "sidebar for spreadsheet", RGN_TYPE_FOOTER);
- if (new_sidebar != NULL) {
- new_sidebar->alignment = RGN_ALIGN_RIGHT;
- new_sidebar->flag |= RGN_FLAG_HIDDEN;
- }
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 4)) {
+ /* Add a properties sidebar to the spreadsheet editor. */
+ LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+ LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+ LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+ if (sl->spacetype == SPACE_SPREADSHEET) {
+ ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
+ &sl->regionbase;
+ ARegion *new_sidebar = do_versions_add_region_if_not_found(
+ regionbase, RGN_TYPE_UI, "sidebar for spreadsheet", RGN_TYPE_FOOTER);
+ if (new_sidebar != NULL) {
+ new_sidebar->alignment = RGN_ALIGN_RIGHT;
+ new_sidebar->flag |= RGN_FLAG_HIDDEN;
}
}
}
}
+ }
- /* Enable spreadsheet filtering in old files without row filters. */
- LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
- LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
- LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
- if (sl->spacetype == SPACE_SPREADSHEET) {
- SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)sl;
- sspreadsheet->filter_flag |= SPREADSHEET_FILTER_ENABLE;
- }
+ /* Enable spreadsheet filtering in old files without row filters. */
+ LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+ LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+ LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+ if (sl->spacetype == SPACE_SPREADSHEET) {
+ SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)sl;
+ sspreadsheet->filter_flag |= SPREADSHEET_FILTER_ENABLE;
}
}
}
+ }
- FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
- if (ntree->type == NTREE_GEOMETRY) {
- version_node_socket_name(ntree, GEO_NODE_BOUNDING_BOX, "Mesh", "Bounding Box");
- }
+ FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+ if (ntree->type == NTREE_GEOMETRY) {
+ version_node_socket_name(ntree, GEO_NODE_BOUNDING_BOX, "Mesh", "Bounding Box");
}
- FOREACH_NODETREE_END;
-
- if (!DNA_struct_elem_find(fd->filesdna, "FileAssetSelectParams", "int", "import_type")) {
- LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
- LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
- LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
- if (sl->spacetype == SPACE_FILE) {
- SpaceFile *sfile = (SpaceFile *)sl;
- if (sfile->asset_params) {
- sfile->asset_params->import_type = FILE_ASSET_IMPORT_APPEND;
- }
+ }
+ FOREACH_NODETREE_END;
+
+ if (!DNA_struct_elem_find(fd->filesdna, "FileAssetSelectParams", "int", "import_type")) {
+ LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+ LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+ LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+ if (sl->spacetype == SPACE_FILE) {
+ SpaceFile *sfile = (SpaceFile *)sl;
+ if (sfile->asset_params) {
+ sfile->asset_params->import_type = FILE_ASSET_IMPORT_APPEND;
}
}
}
}
}
+ }
- /* Initialize length-wise scale B-Bone settings. */
- if (!DNA_struct_elem_find(fd->filesdna, "Bone", "int", "bbone_flag")) {
- /* Update armature data and pose channels. */
- LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
- do_version_bones_bbone_len_scale(&arm->bonebase);
- }
+ /* Initialize length-wise scale B-Bone settings. */
+ if (!DNA_struct_elem_find(fd->filesdna, "Bone", "int", "bbone_flag")) {
+ /* Update armature data and pose channels. */
+ LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
+ do_version_bones_bbone_len_scale(&arm->bonebase);
+ }
- LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
- if (ob->pose) {
- LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
- copy_v3_fl3(pchan->scale_in, pchan->scale_in_x, 1.0f, pchan->scale_in_z);
- copy_v3_fl3(pchan->scale_out, pchan->scale_out_x, 1.0f, pchan->scale_out_z);
- }
+ LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+ if (ob->pose) {
+ LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
+ copy_v3_fl3(pchan->scale_in, pchan->scale_in_x, 1.0f, pchan->scale_in_z);
+ copy_v3_fl3(pchan->scale_out, pchan->scale_out_x, 1.0f, pchan->scale_out_z);
}
}
+ }
- /* Update action curves and drivers. */
- LISTBASE_FOREACH (bAction *, act, &bmain->actions) {
- LISTBASE_FOREACH_MUTABLE (FCurve *, fcu, &act->curves) {
- do_version_bbone_len_scale_fcurve_fix(fcu);
- }
+ /* Update action curves and dr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list