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-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/armature/editarmature_undo.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/armature/editarmature_undo.c')
-rw-r--r--source/blender/editors/armature/editarmature_undo.c241
1 files changed, 126 insertions, 115 deletions
diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c
index 39e8371a824..3a2440af2da 100644
--- a/source/blender/editors/armature/editarmature_undo.c
+++ b/source/blender/editors/armature/editarmature_undo.c
@@ -23,7 +23,6 @@
#include "MEM_guardedalloc.h"
-
#include "CLG_log.h"
#include "DNA_armature_types.h"
@@ -53,69 +52,69 @@ static CLG_LogRef LOG = {"ed.undo.armature"};
* \{ */
typedef struct UndoArmature {
- EditBone *act_edbone;
- ListBase lb;
- size_t undo_size;
+ EditBone *act_edbone;
+ ListBase lb;
+ size_t undo_size;
} UndoArmature;
static void undoarm_to_editarm(UndoArmature *uarm, bArmature *arm)
{
- EditBone *ebone;
+ EditBone *ebone;
- ED_armature_ebone_listbase_free(arm->edbo);
- ED_armature_ebone_listbase_copy(arm->edbo, &uarm->lb);
+ ED_armature_ebone_listbase_free(arm->edbo);
+ ED_armature_ebone_listbase_copy(arm->edbo, &uarm->lb);
- /* active bone */
- if (uarm->act_edbone) {
- ebone = uarm->act_edbone;
- arm->act_edbone = ebone->temp.ebone;
- }
- else {
- arm->act_edbone = NULL;
- }
+ /* active bone */
+ if (uarm->act_edbone) {
+ ebone = uarm->act_edbone;
+ arm->act_edbone = ebone->temp.ebone;
+ }
+ else {
+ arm->act_edbone = NULL;
+ }
- ED_armature_ebone_listbase_temp_clear(arm->edbo);
+ ED_armature_ebone_listbase_temp_clear(arm->edbo);
}
static void *undoarm_from_editarm(UndoArmature *uarm, bArmature *arm)
{
- BLI_assert(BLI_array_is_zeroed(uarm, 1));
+ BLI_assert(BLI_array_is_zeroed(uarm, 1));
- /* TODO: include size of ID-properties. */
- uarm->undo_size = 0;
+ /* TODO: include size of ID-properties. */
+ uarm->undo_size = 0;
- ED_armature_ebone_listbase_copy(&uarm->lb, arm->edbo);
+ ED_armature_ebone_listbase_copy(&uarm->lb, arm->edbo);
- /* active bone */
- if (arm->act_edbone) {
- EditBone *ebone = arm->act_edbone;
- uarm->act_edbone = ebone->temp.ebone;
- }
+ /* active bone */
+ if (arm->act_edbone) {
+ EditBone *ebone = arm->act_edbone;
+ uarm->act_edbone = ebone->temp.ebone;
+ }
- ED_armature_ebone_listbase_temp_clear(&uarm->lb);
+ ED_armature_ebone_listbase_temp_clear(&uarm->lb);
- for (EditBone *ebone = uarm->lb.first; ebone; ebone = ebone->next) {
- uarm->undo_size += sizeof(EditBone);
- }
+ for (EditBone *ebone = uarm->lb.first; ebone; ebone = ebone->next) {
+ uarm->undo_size += sizeof(EditBone);
+ }
- return uarm;
+ return uarm;
}
static void undoarm_free_data(UndoArmature *uarm)
{
- ED_armature_ebone_listbase_free(&uarm->lb);
+ ED_armature_ebone_listbase_free(&uarm->lb);
}
static Object *editarm_object_from_context(bContext *C)
{
- Object *obedit = CTX_data_edit_object(C);
- if (obedit && obedit->type == OB_ARMATURE) {
- bArmature *arm = obedit->data;
- if (arm->edbo != NULL) {
- return obedit;
- }
- }
- return NULL;
+ Object *obedit = CTX_data_edit_object(C);
+ if (obedit && obedit->type == OB_ARMATURE) {
+ bArmature *arm = obedit->data;
+ if (arm->edbo != NULL) {
+ return obedit;
+ }
+ }
+ return NULL;
}
/** \} */
@@ -127,112 +126,124 @@ static Object *editarm_object_from_context(bContext *C)
* \{ */
typedef struct ArmatureUndoStep_Elem {
- struct ArmatureUndoStep_Elem *next, *prev;
- UndoRefID_Object obedit_ref;
- UndoArmature data;
+ struct ArmatureUndoStep_Elem *next, *prev;
+ UndoRefID_Object obedit_ref;
+ UndoArmature data;
} ArmatureUndoStep_Elem;
typedef struct ArmatureUndoStep {
- UndoStep step;
- ArmatureUndoStep_Elem *elems;
- uint elems_len;
+ UndoStep step;
+ ArmatureUndoStep_Elem *elems;
+ uint elems_len;
} ArmatureUndoStep;
static bool armature_undosys_poll(bContext *C)
{
- return editarm_object_from_context(C) != NULL;
+ return editarm_object_from_context(C) != NULL;
}
-static bool armature_undosys_step_encode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p)
+static bool armature_undosys_step_encode(struct bContext *C,
+ struct Main *UNUSED(bmain),
+ UndoStep *us_p)
{
- ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
-
- /* Important not to use the 3D view when getting objects because all objects
- * outside of this list will be moved out of edit-mode when reading back undo steps. */
- ViewLayer *view_layer = CTX_data_view_layer(C);
- uint objects_len = 0;
- Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, NULL, &objects_len);
-
- us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
- us->elems_len = objects_len;
-
- for (uint i = 0; i < objects_len; i++) {
- Object *ob = objects[i];
- ArmatureUndoStep_Elem *elem = &us->elems[i];
-
- elem->obedit_ref.ptr = ob;
- bArmature *arm = elem->obedit_ref.ptr->data;
- undoarm_from_editarm(&elem->data, arm);
- us->step.data_size += elem->data.undo_size;
- }
- MEM_freeN(objects);
- return true;
+ ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
+
+ /* Important not to use the 3D view when getting objects because all objects
+ * outside of this list will be moved out of edit-mode when reading back undo steps. */
+ ViewLayer *view_layer = CTX_data_view_layer(C);
+ uint objects_len = 0;
+ Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
+ view_layer, NULL, &objects_len);
+
+ us->elems = MEM_callocN(sizeof(*us->elems) * objects_len, __func__);
+ us->elems_len = objects_len;
+
+ for (uint i = 0; i < objects_len; i++) {
+ Object *ob = objects[i];
+ ArmatureUndoStep_Elem *elem = &us->elems[i];
+
+ elem->obedit_ref.ptr = ob;
+ bArmature *arm = elem->obedit_ref.ptr->data;
+ undoarm_from_editarm(&elem->data, arm);
+ us->step.data_size += elem->data.undo_size;
+ }
+ MEM_freeN(objects);
+ return true;
}
-static void armature_undosys_step_decode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p, int UNUSED(dir))
+static void armature_undosys_step_decode(struct bContext *C,
+ struct Main *UNUSED(bmain),
+ UndoStep *us_p,
+ int UNUSED(dir))
{
- ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
-
- /* Load all our objects into edit-mode, clear everything else. */
- ED_undo_object_editmode_restore_helper(C, &us->elems[0].obedit_ref.ptr, us->elems_len, sizeof(*us->elems));
-
- BLI_assert(armature_undosys_poll(C));
-
- for (uint i = 0; i < us->elems_len; i++) {
- ArmatureUndoStep_Elem *elem = &us->elems[i];
- Object *obedit = elem->obedit_ref.ptr;
- bArmature *arm = obedit->data;
- if (arm->edbo == NULL) {
- /* Should never fail, may not crash but can give odd behavior. */
- CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid", us_p->name, obedit->id.name);
- continue;
- }
- undoarm_to_editarm(&elem->data, arm);
- DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY);
- }
-
- /* The first element is always active */
- ED_undo_object_set_active_or_warn(CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
-
- WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
+ ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
+
+ /* Load all our objects into edit-mode, clear everything else. */
+ ED_undo_object_editmode_restore_helper(
+ C, &us->elems[0].obedit_ref.ptr, us->elems_len, sizeof(*us->elems));
+
+ BLI_assert(armature_undosys_poll(C));
+
+ for (uint i = 0; i < us->elems_len; i++) {
+ ArmatureUndoStep_Elem *elem = &us->elems[i];
+ Object *obedit = elem->obedit_ref.ptr;
+ bArmature *arm = obedit->data;
+ if (arm->edbo == NULL) {
+ /* Should never fail, may not crash but can give odd behavior. */
+ CLOG_ERROR(&LOG,
+ "name='%s', failed to enter edit-mode for object '%s', undo state invalid",
+ us_p->name,
+ obedit->id.name);
+ continue;
+ }
+ undoarm_to_editarm(&elem->data, arm);
+ DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY);
+ }
+
+ /* The first element is always active */
+ ED_undo_object_set_active_or_warn(
+ CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
+
+ WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
}
static void armature_undosys_step_free(UndoStep *us_p)
{
- ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
+ ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
- for (uint i = 0; i < us->elems_len; i++) {
- ArmatureUndoStep_Elem *elem = &us->elems[i];
- undoarm_free_data(&elem->data);
- }
- MEM_freeN(us->elems);
+ for (uint i = 0; i < us->elems_len; i++) {
+ ArmatureUndoStep_Elem *elem = &us->elems[i];
+ undoarm_free_data(&elem->data);
+ }
+ MEM_freeN(us->elems);
}
-static void armature_undosys_foreach_ID_ref(
- UndoStep *us_p, UndoTypeForEachIDRefFn foreach_ID_ref_fn, void *user_data)
+static void armature_undosys_foreach_ID_ref(UndoStep *us_p,
+ UndoTypeForEachIDRefFn foreach_ID_ref_fn,
+ void *user_data)
{
- ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
+ ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
- for (uint i = 0; i < us->elems_len; i++) {
- ArmatureUndoStep_Elem *elem = &us->elems[i];
- foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
- }
+ for (uint i = 0; i < us->elems_len; i++) {
+ ArmatureUndoStep_Elem *elem = &us->elems[i];
+ foreach_ID_ref_fn(user_data, ((UndoRefID *)&elem->obedit_ref));
+ }
}
/* Export for ED_undo_sys. */
void ED_armature_undosys_type(UndoType *ut)
{
- ut->name = "Edit Armature";
- ut->poll = armature_undosys_poll;
- ut->step_encode = armature_undosys_step_encode;
- ut->step_decode = armature_undosys_step_decode;
- ut->step_free = armature_undosys_step_free;
+ ut->name = "Edit Armature";
+ ut->poll = armature_undosys_poll;
+ ut->step_encode = armature_undosys_step_encode;
+ ut->step_decode = armature_undosys_step_decode;
+ ut->step_free = armature_undosys_step_free;
- ut->step_foreach_ID_ref = armature_undosys_foreach_ID_ref;
+ ut->step_foreach_ID_ref = armature_undosys_foreach_ID_ref;
- ut->use_context = true;
+ ut->use_context = true;
- ut->step_size = sizeof(ArmatureUndoStep);
+ ut->step_size = sizeof(ArmatureUndoStep);
}
/** \} */