diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp index d9e5b0c4e9d..fbe5159ea78 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cpp +++ b/intern/ghost/intern/GHOST_SystemWayland.cpp @@ -280,41 +280,41 @@ struct GWL_ModifierInfo { }; static const GWL_ModifierInfo g_modifier_info_table[MOD_INDEX_NUM] = { - /* MOD_INDEX_SHIFT */ + /*MOD_INDEX_SHIFT*/ { - /* display_name */ "Shift", - /* xkb_id */ XKB_MOD_NAME_SHIFT, - /* key_l */ GHOST_kKeyLeftShift, - /* key_r */ GHOST_kKeyRightShift, - /* mod_l */ GHOST_kModifierKeyLeftShift, - /* mod_r */ GHOST_kModifierKeyRightShift, + /*display_name*/ "Shift", + /*xkb_id*/ XKB_MOD_NAME_SHIFT, + /*key_l*/ GHOST_kKeyLeftShift, + /*key_r*/ GHOST_kKeyRightShift, + /*mod_l*/ GHOST_kModifierKeyLeftShift, + /*mod_r*/ GHOST_kModifierKeyRightShift, }, - /* MOD_INDEX_ALT */ + /*MOD_INDEX_ALT*/ { - /* display_name */ "Alt", - /* xkb_id */ XKB_MOD_NAME_ALT, - /* key_l */ GHOST_kKeyLeftAlt, - /* key_r */ GHOST_kKeyRightAlt, - /* mod_l */ GHOST_kModifierKeyLeftAlt, - /* mod_r */ GHOST_kModifierKeyRightAlt, + /*display_name*/ "Alt", + /*xkb_id*/ XKB_MOD_NAME_ALT, + /*key_l*/ GHOST_kKeyLeftAlt, + /*key_r*/ GHOST_kKeyRightAlt, + /*mod_l*/ GHOST_kModifierKeyLeftAlt, + /*mod_r*/ GHOST_kModifierKeyRightAlt, }, - /* MOD_INDEX_CTRL */ + /*MOD_INDEX_CTRL*/ { - /* display_name */ "Control", - /* xkb_id */ XKB_MOD_NAME_CTRL, - /* key_l */ GHOST_kKeyLeftControl, - /* key_r */ GHOST_kKeyRightControl, - /* mod_l */ GHOST_kModifierKeyLeftControl, - /* mod_r */ GHOST_kModifierKeyRightControl, + /*display_name*/ "Control", + /*xkb_id*/ XKB_MOD_NAME_CTRL, + /*key_l*/ GHOST_kKeyLeftControl, + /*key_r*/ GHOST_kKeyRightControl, + /*mod_l*/ GHOST_kModifierKeyLeftControl, + /*mod_r*/ GHOST_kModifierKeyRightControl, }, - /* MOD_INDEX_OS */ + /*MOD_INDEX_OS*/ { - /* display_name */ "OS", - /* xkb_id */ XKB_MOD_NAME_LOGO, - /* key_l */ GHOST_kKeyLeftOS, - /* key_r */ GHOST_kKeyRightOS, - /* mod_l */ GHOST_kModifierKeyLeftOS, - /* mod_r */ GHOST_kModifierKeyRightOS, + /*display_name*/ "OS", + /*xkb_id*/ XKB_MOD_NAME_LOGO, + /*key_l*/ GHOST_kKeyLeftOS, + /*key_r*/ GHOST_kKeyRightOS, + /*mod_l*/ GHOST_kModifierKeyLeftOS, + /*mod_r*/ GHOST_kModifierKeyRightOS, }, }; diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index dcd0c25967b..d4a7a7cbb1e 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -294,7 +294,7 @@ static void action_asset_pre_save(void *asset_ptr, struct AssetMetaData *asset_d } static AssetTypeInfo AssetType_AC = { - /* pre_save_fn */ action_asset_pre_save, + /*pre_save_fn*/ action_asset_pre_save, }; IDTypeInfo IDType_ID_AC = { diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index 28baa871e12..414a316ba7a 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -411,33 +411,33 @@ static void brush_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old) } IDTypeInfo IDType_ID_BR = { - /* id_code */ ID_BR, - /* id_filter */ FILTER_ID_BR, - /* main_listbase_index */ INDEX_ID_BR, - /* struct_size */ sizeof(Brush), - /* name */ "Brush", - /* name_plural */ "brushes", - /* translation_context */ BLT_I18NCONTEXT_ID_BRUSH, - /* flags */ IDTYPE_FLAGS_NO_ANIMDATA, - /* asset_type_info */ nullptr, + /*id_code*/ ID_BR, + /*id_filter*/ FILTER_ID_BR, + /*main_listbase_index*/ INDEX_ID_BR, + /*struct_size*/ sizeof(Brush), + /*name*/ "Brush", + /*name_plural*/ "brushes", + /*translation_context*/ BLT_I18NCONTEXT_ID_BRUSH, + /*flags*/ IDTYPE_FLAGS_NO_ANIMDATA, + /*asset_type_info*/ nullptr, - /* init_data */ brush_init_data, - /* copy_data */ brush_copy_data, - /* free_data */ brush_free_data, - /* make_local */ brush_make_local, - /* foreach_id */ brush_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ brush_foreach_path, - /* owner_pointer_get */ nullptr, + /*init_data*/ brush_init_data, + /*copy_data*/ brush_copy_data, + /*free_data*/ brush_free_data, + /*make_local*/ brush_make_local, + /*foreach_id*/ brush_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ brush_foreach_path, + /*owner_pointer_get*/ nullptr, - /* blend_write */ brush_blend_write, - /* blend_read_data */ brush_blend_read_data, - /* blend_read_lib */ brush_blend_read_lib, - /* blend_read_expand */ brush_blend_read_expand, + /*blend_write*/ brush_blend_write, + /*blend_read_data*/ brush_blend_read_data, + /*blend_read_lib*/ brush_blend_read_lib, + /*blend_read_expand*/ brush_blend_read_expand, - /* blend_read_undo_preserve */ brush_undo_preserve, + /*blend_read_undo_preserve*/ brush_undo_preserve, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; static RNG *brush_rng; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 4ebf7d184b3..93ab47651ed 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -787,18 +787,18 @@ static void constraint_target_to_mat4(Object *ob, */ #if 0 static bConstraintTypeInfo CTI_CONSTRNAME = { - CONSTRAINT_TYPE_CONSTRNAME, /* type */ - sizeof(bConstrNameConstraint), /* size */ - "ConstrName", /* name */ - "bConstrNameConstraint", /* struct name */ - constrname_free, /* free data */ - constrname_id_looper, /* id looper */ - constrname_copy, /* copy data */ - constrname_new_data, /* new data */ - constrname_get_tars, /* get constraint targets */ - constrname_flush_tars, /* flush constraint targets */ - constrname_get_tarmat, /* get target matrix */ - constrname_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_CONSTRNAME, + /*size*/ sizeof(bConstrNameConstraint), + /*name*/ "ConstrName", + /*structName*/ "bConstrNameConstraint", + /*free_data*/ constrname_free, + /*id_looper*/ constrname_id_looper, + /*copy_data*/ constrname_copy, + /*new_data*/ constrname_new_data, + /*get_constraint_targets*/ constrname_get_tars, + /*flush_constraint_targets*/ constrname_flush_tars, + /*get_target_matrix*/ constrname_get_tarmat, + /*evaluate_constraint*/ constrname_evaluate, }; #endif @@ -1109,18 +1109,18 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar /* XXX NOTE: con->flag should be CONSTRAINT_SPACEONCE for bone-childof, patched in `readfile.c`. */ static bConstraintTypeInfo CTI_CHILDOF = { - CONSTRAINT_TYPE_CHILDOF, /* type */ - sizeof(bChildOfConstraint), /* size */ - N_("Child Of"), /* name */ - "bChildOfConstraint", /* struct name */ - NULL, /* free data */ - childof_id_looper, /* id looper */ - NULL, /* copy data */ - childof_new_data, /* new data */ - childof_get_tars, /* get constraint targets */ - childof_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get a target matrix */ - childof_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_CHILDOF, + /*size*/ sizeof(bChildOfConstraint), + /*name*/ N_("Child Of"), + /*structName*/ "bChildOfConstraint", + /*free_data*/ NULL, + /*id_looper*/ childof_id_looper, + /*copy_data*/ NULL, + /*new_data*/ childof_new_data, + /*get_constraint_targets*/ childof_get_tars, + /*flush_constraint_targets*/ childof_flush_tars, + /* get a target matrix */ default_get_tarmat, + /*evaluate_constraint*/ childof_evaluate, }; /* -------- TrackTo Constraint ------- */ @@ -1293,18 +1293,18 @@ static void trackto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar } static bConstraintTypeInfo CTI_TRACKTO = { - CONSTRAINT_TYPE_TRACKTO, /* type */ - sizeof(bTrackToConstraint), /* size */ - N_("Track To"), /* name */ - "bTrackToConstraint", /* struct name */ - NULL, /* free data */ - trackto_id_looper, /* id looper */ - NULL, /* copy data */ - trackto_new_data, /* new data */ - trackto_get_tars, /* get constraint targets */ - trackto_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - trackto_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_TRACKTO, + /*size*/ sizeof(bTrackToConstraint), + /*name*/ N_("Track To"), + /*structName*/ "bTrackToConstraint", + /*free_data*/ NULL, + /*id_looper*/ trackto_id_looper, + /*copy_data*/ NULL, + /*new_data*/ trackto_new_data, + /*get_constraint_targets*/ trackto_get_tars, + /*flush_constraint_targets*/ trackto_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ trackto_evaluate, }; /* --------- Inverse-Kinematics --------- */ @@ -1399,18 +1399,18 @@ static void kinematic_get_tarmat(struct Depsgraph *UNUSED(depsgraph), } static bConstraintTypeInfo CTI_KINEMATIC = { - CONSTRAINT_TYPE_KINEMATIC, /* type */ - sizeof(bKinematicConstraint), /* size */ - N_("IK"), /* name */ - "bKinematicConstraint", /* struct name */ - NULL, /* free data */ - kinematic_id_looper, /* id looper */ - NULL, /* copy data */ - kinematic_new_data, /* new data */ - kinematic_get_tars, /* get constraint targets */ - kinematic_flush_tars, /* flush constraint targets */ - kinematic_get_tarmat, /* get target matrix */ - NULL, /* evaluate - solved as separate loop */ + /*type*/ CONSTRAINT_TYPE_KINEMATIC, + /*size*/ sizeof(bKinematicConstraint), + /*name*/ N_("IK"), + /*structName*/ "bKinematicConstraint", + /*free_data*/ NULL, + /*id_looper*/ kinematic_id_looper, + /*copy_data*/ NULL, + /*new_data*/ kinematic_new_data, + /*get_constraint_targets*/ kinematic_get_tars, + /*flush_constraint_targets*/ kinematic_flush_tars, + /*get_target_matrix*/ kinematic_get_tarmat, + /* evaluate - solved as separate loop */ NULL, }; /* -------- Follow-Path Constraint ---------- */ @@ -1577,18 +1577,18 @@ static void followpath_evaluate(bConstraint *con, bConstraintOb *cob, ListBase * } static bConstraintTypeInfo CTI_FOLLOWPATH = { - CONSTRAINT_TYPE_FOLLOWPATH, /* type */ - sizeof(bFollowPathConstraint), /* size */ - N_("Follow Path"), /* name */ - "bFollowPathConstraint", /* struct name */ - NULL, /* free data */ - followpath_id_looper, /* id looper */ - NULL, /* copy data */ - followpath_new_data, /* new data */ - followpath_get_tars, /* get constraint targets */ - followpath_flush_tars, /* flush constraint targets */ - followpath_get_tarmat, /* get target matrix */ - followpath_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_FOLLOWPATH, + /*size*/ sizeof(bFollowPathConstraint), + /*name*/ N_("Follow Path"), + /*structName*/ "bFollowPathConstraint", + /*free_data*/ NULL, + /*id_looper*/ followpath_id_looper, + /*copy_data*/ NULL, + /*new_data*/ followpath_new_data, + /*get_constraint_targets*/ followpath_get_tars, + /*flush_constraint_targets*/ followpath_flush_tars, + /*get_target_matrix*/ followpath_get_tarmat, + /*evaluate_constraint*/ followpath_evaluate, }; /* --------- Limit Location --------- */ @@ -1630,18 +1630,18 @@ static void loclimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *UN } static bConstraintTypeInfo CTI_LOCLIMIT = { - CONSTRAINT_TYPE_LOCLIMIT, /* type */ - sizeof(bLocLimitConstraint), /* size */ - N_("Limit Location"), /* name */ - "bLocLimitConstraint", /* struct name */ - NULL, /* free data */ - NULL, /* id looper */ - NULL, /* copy data */ - NULL, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - loclimit_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_LOCLIMIT, + /*size*/ sizeof(bLocLimitConstraint), + /*name*/ N_("Limit Location"), + /*structName*/ "bLocLimitConstraint", + /*free_data*/ NULL, + /*id_looper*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ loclimit_evaluate, }; /* -------- Limit Rotation --------- */ @@ -1711,18 +1711,18 @@ static void rotlimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *UN } static bConstraintTypeInfo CTI_ROTLIMIT = { - CONSTRAINT_TYPE_ROTLIMIT, /* type */ - sizeof(bRotLimitConstraint), /* size */ - N_("Limit Rotation"), /* name */ - "bRotLimitConstraint", /* struct name */ - NULL, /* free data */ - NULL, /* id looper */ - NULL, /* copy data */ - NULL, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - rotlimit_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_ROTLIMIT, + /*size*/ sizeof(bRotLimitConstraint), + /*name*/ N_("Limit Rotation"), + /*structName*/ "bRotLimitConstraint", + /*free_data*/ NULL, + /*id_looper*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ rotlimit_evaluate, }; /* --------- Limit Scale --------- */ @@ -1778,18 +1778,18 @@ static void sizelimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *U } static bConstraintTypeInfo CTI_SIZELIMIT = { - CONSTRAINT_TYPE_SIZELIMIT, /* type */ - sizeof(bSizeLimitConstraint), /* size */ - N_("Limit Scale"), /* name */ - "bSizeLimitConstraint", /* struct name */ - NULL, /* free data */ - NULL, /* id looper */ - NULL, /* copy data */ - NULL, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - sizelimit_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_SIZELIMIT, + /*size*/ sizeof(bSizeLimitConstraint), + /*name*/ N_("Limit Scale"), + /*structName*/ "bSizeLimitConstraint", + /*free_data*/ NULL, + /*id_looper*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ sizelimit_evaluate, }; /* ----------- Copy Location ------------- */ @@ -1875,18 +1875,18 @@ static void loclike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar } static bConstraintTypeInfo CTI_LOCLIKE = { - CONSTRAINT_TYPE_LOCLIKE, /* type */ - sizeof(bLocateLikeConstraint), /* size */ - N_("Copy Location"), /* name */ - "bLocateLikeConstraint", /* struct name */ - NULL, /* free data */ - loclike_id_looper, /* id looper */ - NULL, /* copy data */ - loclike_new_data, /* new data */ - loclike_get_tars, /* get constraint targets */ - loclike_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - loclike_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_LOCLIKE, + /*size*/ sizeof(bLocateLikeConstraint), + /*name*/ N_("Copy Location"), + /*structName*/ "bLocateLikeConstraint", + /*free_data*/ NULL, + /*id_looper*/ loclike_id_looper, + /*copy_data*/ NULL, + /*new_data*/ loclike_new_data, + /*get_constraint_targets*/ loclike_get_tars, + /*flush_constraint_targets*/ loclike_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ loclike_evaluate, }; /* ----------- Copy Rotation ------------- */ @@ -2052,18 +2052,18 @@ static void rotlike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar } static bConstraintTypeInfo CTI_ROTLIKE = { - CONSTRAINT_TYPE_ROTLIKE, /* type */ - sizeof(bRotateLikeConstraint), /* size */ - N_("Copy Rotation"), /* name */ - "bRotateLikeConstraint", /* struct name */ - NULL, /* free data */ - rotlike_id_looper, /* id looper */ - NULL, /* copy data */ - rotlike_new_data, /* new data */ - rotlike_get_tars, /* get constraint targets */ - rotlike_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - rotlike_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_ROTLIKE, + /*size*/ sizeof(bRotateLikeConstraint), + /*name*/ N_("Copy Rotation"), + /*structName*/ "bRotateLikeConstraint", + /*free_data*/ NULL, + /*id_looper*/ rotlike_id_looper, + /*copy_data*/ NULL, + /*new_data*/ rotlike_new_data, + /*get_constraint_targets*/ rotlike_get_tars, + /*flush_constraint_targets*/ rotlike_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ rotlike_evaluate, }; /* ---------- Copy Scale ---------- */ @@ -2182,18 +2182,18 @@ static void sizelike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *ta } static bConstraintTypeInfo CTI_SIZELIKE = { - CONSTRAINT_TYPE_SIZELIKE, /* type */ - sizeof(bSizeLikeConstraint), /* size */ - N_("Copy Scale"), /* name */ - "bSizeLikeConstraint", /* struct name */ - NULL, /* free data */ - sizelike_id_looper, /* id looper */ - NULL, /* copy data */ - sizelike_new_data, /* new data */ - sizelike_get_tars, /* get constraint targets */ - sizelike_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - sizelike_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_SIZELIKE, + /*size*/ sizeof(bSizeLikeConstraint), + /*name*/ N_("Copy Scale"), + /*structName*/ "bSizeLikeConstraint", + /*free_data*/ NULL, + /*id_looper*/ sizelike_id_looper, + /*copy_data*/ NULL, + /*new_data*/ sizelike_new_data, + /*get_constraint_targets*/ sizelike_get_tars, + /*flush_constraint_targets*/ sizelike_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ sizelike_evaluate, }; /* ----------- Copy Transforms ------------- */ @@ -2288,18 +2288,18 @@ static void translike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t } static bConstraintTypeInfo CTI_TRANSLIKE = { - CONSTRAINT_TYPE_TRANSLIKE, /* type */ - sizeof(bTransLikeConstraint), /* size */ - N_("Copy Transforms"), /* name */ - "bTransLikeConstraint", /* struct name */ - NULL, /* free data */ - translike_id_looper, /* id looper */ - NULL, /* copy data */ - NULL, /* new data */ - translike_get_tars, /* get constraint targets */ - translike_flush_tars, /* flush constraint targets */ - default_get_tarmat_full_bbone, /* get target matrix */ - translike_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_TRANSLIKE, + /*size*/ sizeof(bTransLikeConstraint), + /*name*/ N_("Copy Transforms"), + /*structName*/ "bTransLikeConstraint", + /*free_data*/ NULL, + /*id_looper*/ translike_id_looper, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /*get_constraint_targets*/ translike_get_tars, + /*flush_constraint_targets*/ translike_flush_tars, + /*get_target_matrix*/ default_get_tarmat_full_bbone, + /*evaluate_constraint*/ translike_evaluate, }; /* ---------- Maintain Volume ---------- */ @@ -2357,18 +2357,18 @@ static void samevolume_evaluate(bConstraint *con, bConstraintOb *cob, ListBase * } static bConstraintTypeInfo CTI_SAMEVOL = { - CONSTRAINT_TYPE_SAMEVOL, /* type */ - sizeof(bSameVolumeConstraint), /* size */ - N_("Maintain Volume"), /* name */ - "bSameVolumeConstraint", /* struct name */ - NULL, /* free data */ - NULL, /* id looper */ - NULL, /* copy data */ - samevolume_new_data, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - samevolume_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_SAMEVOL, + /*size*/ sizeof(bSameVolumeConstraint), + /*name*/ N_("Maintain Volume"), + /*structName*/ "bSameVolumeConstraint", + /*free_data*/ NULL, + /*id_looper*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ samevolume_new_data, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ samevolume_evaluate, }; /* ----------- Python Constraint -------------- */ @@ -2489,18 +2489,18 @@ static void pycon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targe } static bConstraintTypeInfo CTI_PYTHON = { - CONSTRAINT_TYPE_PYTHON, /* type */ - sizeof(bPythonConstraint), /* size */ - N_("Script"), /* name */ - "bPythonConstraint", /* struct name */ - pycon_free, /* free data */ - pycon_id_looper, /* id looper */ - pycon_copy, /* copy data */ - pycon_new_data, /* new data */ - pycon_get_tars, /* get constraint targets */ - NULL, /* flush constraint targets */ - pycon_get_tarmat, /* get target matrix */ - pycon_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_PYTHON, + /*size*/ sizeof(bPythonConstraint), + /*name*/ N_("Script"), + /*structName*/ "bPythonConstraint", + /*free_data*/ pycon_free, + /*id_looper*/ pycon_id_looper, + /*copy_data*/ pycon_copy, + /*new_data*/ pycon_new_data, + /*get_constraint_targets*/ pycon_get_tars, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ pycon_get_tarmat, + /*evaluate_constraint*/ pycon_evaluate, }; /* ----------- Armature Constraint -------------- */ @@ -2741,18 +2741,18 @@ static void armdef_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ } static bConstraintTypeInfo CTI_ARMATURE = { - CONSTRAINT_TYPE_ARMATURE, /* type */ - sizeof(bArmatureConstraint), /* size */ - N_("Armature"), /* name */ - "bArmatureConstraint", /* struct name */ - armdef_free, /* free data */ - armdef_id_looper, /* id looper */ - armdef_copy, /* copy data */ - NULL, /* new data */ - armdef_get_tars, /* get constraint targets */ - NULL, /* flush constraint targets */ - armdef_get_tarmat, /* get target matrix */ - armdef_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_ARMATURE, + /*size*/ sizeof(bArmatureConstraint), + /*name*/ N_("Armature"), + /*structName*/ "bArmatureConstraint", + /*free_data*/ armdef_free, + /*id_looper*/ armdef_id_looper, + /*copy_data*/ armdef_copy, + /*new_data*/ NULL, + /*get_constraint_targets*/ armdef_get_tars, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ armdef_get_tarmat, + /*evaluate_constraint*/ armdef_evaluate, }; /* -------- Action Constraint ----------- */ @@ -2957,18 +2957,18 @@ static void actcon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ } static bConstraintTypeInfo CTI_ACTION = { - CONSTRAINT_TYPE_ACTION, /* type */ - sizeof(bActionConstraint), /* size */ - N_("Action"), /* name */ - "bActionConstraint", /* struct name */ - NULL, /* free data */ - actcon_id_looper, /* id looper */ - NULL, /* copy data */ - actcon_new_data, /* new data */ - actcon_get_tars, /* get constraint targets */ - actcon_flush_tars, /* flush constraint targets */ - actcon_get_tarmat, /* get target matrix */ - actcon_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_ACTION, + /*size*/ sizeof(bActionConstraint), + /*name*/ N_("Action"), + /*structName*/ "bActionConstraint", + /*free_data*/ NULL, + /*id_looper*/ actcon_id_looper, + /*copy_data*/ NULL, + /*new_data*/ actcon_new_data, + /*get_constraint_targets*/ actcon_get_tars, + /*flush_constraint_targets*/ actcon_flush_tars, + /*get_target_matrix*/ actcon_get_tarmat, + /*evaluate_constraint*/ actcon_evaluate, }; /* --------- Locked Track ---------- */ @@ -3273,18 +3273,18 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t } static bConstraintTypeInfo CTI_LOCKTRACK = { - CONSTRAINT_TYPE_LOCKTRACK, /* type */ - sizeof(bLockTrackConstraint), /* size */ - N_("Locked Track"), /* name */ - "bLockTrackConstraint", /* struct name */ - NULL, /* free data */ - locktrack_id_looper, /* id looper */ - NULL, /* copy data */ - locktrack_new_data, /* new data */ - locktrack_get_tars, /* get constraint targets */ - locktrack_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - locktrack_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_LOCKTRACK, + /*size*/ sizeof(bLockTrackConstraint), + /*name*/ N_("Locked Track"), + /*structName*/ "bLockTrackConstraint", + /*free_data*/ NULL, + /*id_looper*/ locktrack_id_looper, + /*copy_data*/ NULL, + /*new_data*/ locktrack_new_data, + /*get_constraint_targets*/ locktrack_get_tars, + /*flush_constraint_targets*/ locktrack_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ locktrack_evaluate, }; /* ---------- Limit Distance Constraint ----------- */ @@ -3416,18 +3416,18 @@ static void distlimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t } static bConstraintTypeInfo CTI_DISTLIMIT = { - CONSTRAINT_TYPE_DISTLIMIT, /* type */ - sizeof(bDistLimitConstraint), /* size */ - N_("Limit Distance"), /* name */ - "bDistLimitConstraint", /* struct name */ - NULL, /* free data */ - distlimit_id_looper, /* id looper */ - NULL, /* copy data */ - distlimit_new_data, /* new data */ - distlimit_get_tars, /* get constraint targets */ - distlimit_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get a target matrix */ - distlimit_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_DISTLIMIT, + /*size*/ sizeof(bDistLimitConstraint), + /*name*/ N_("Limit Distance"), + /*structName*/ "bDistLimitConstraint", + /*free_data*/ NULL, + /*id_looper*/ distlimit_id_looper, + /*copy_data*/ NULL, + /*new_data*/ distlimit_new_data, + /*get_constraint_targets*/ distlimit_get_tars, + /*flush_constraint_targets*/ distlimit_flush_tars, + /* get a target matrix */ default_get_tarmat, + /*evaluate_constraint*/ distlimit_evaluate, }; /* ---------- Stretch To ------------ */ @@ -3624,18 +3624,18 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t } static bConstraintTypeInfo CTI_STRETCHTO = { - CONSTRAINT_TYPE_STRETCHTO, /* type */ - sizeof(bStretchToConstraint), /* size */ - N_("Stretch To"), /* name */ - "bStretchToConstraint", /* struct name */ - NULL, /* free data */ - stretchto_id_looper, /* id looper */ - NULL, /* copy data */ - stretchto_new_data, /* new data */ - stretchto_get_tars, /* get constraint targets */ - stretchto_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - stretchto_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_STRETCHTO, + /*size*/ sizeof(bStretchToConstraint), + /*name*/ N_("Stretch To"), + /*structName*/ "bStretchToConstraint", + /*free_data*/ NULL, + /*id_looper*/ stretchto_id_looper, + /*copy_data*/ NULL, + /*new_data*/ stretchto_new_data, + /*get_constraint_targets*/ stretchto_get_tars, + /*flush_constraint_targets*/ stretchto_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ stretchto_evaluate, }; /* ---------- Floor ------------ */ @@ -3755,18 +3755,18 @@ static void minmax_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ } static bConstraintTypeInfo CTI_MINMAX = { - CONSTRAINT_TYPE_MINMAX, /* type */ - sizeof(bMinMaxConstraint), /* size */ - N_("Floor"), /* name */ - "bMinMaxConstraint", /* struct name */ - NULL, /* free data */ - minmax_id_looper, /* id looper */ - NULL, /* copy data */ - minmax_new_data, /* new data */ - minmax_get_tars, /* get constraint targets */ - minmax_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - minmax_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_MINMAX, + /*size*/ sizeof(bMinMaxConstraint), + /*name*/ N_("Floor"), + /*structName*/ "bMinMaxConstraint", + /*free_data*/ NULL, + /*id_looper*/ minmax_id_looper, + /*copy_data*/ NULL, + /*new_data*/ minmax_new_data, + /*get_constraint_targets*/ minmax_get_tars, + /*flush_constraint_targets*/ minmax_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ minmax_evaluate, }; /* -------- Clamp To ---------- */ @@ -3941,18 +3941,18 @@ static void clampto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar } static bConstraintTypeInfo CTI_CLAMPTO = { - CONSTRAINT_TYPE_CLAMPTO, /* type */ - sizeof(bClampToConstraint), /* size */ - N_("Clamp To"), /* name */ - "bClampToConstraint", /* struct name */ - NULL, /* free data */ - clampto_id_looper, /* id looper */ - NULL, /* copy data */ - NULL, /* new data */ - clampto_get_tars, /* get constraint targets */ - clampto_flush_tars, /* flush constraint targets */ - clampto_get_tarmat, /* get target matrix */ - clampto_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_CLAMPTO, + /*size*/ sizeof(bClampToConstraint), + /*name*/ N_("Clamp To"), + /*structName*/ "bClampToConstraint", + /*free_data*/ NULL, + /*id_looper*/ clampto_id_looper, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /*get_constraint_targets*/ clampto_get_tars, + /*flush_constraint_targets*/ clampto_flush_tars, + /*get_target_matrix*/ clampto_get_tarmat, + /*evaluate_constraint*/ clampto_evaluate, }; /* ---------- Transform Constraint ----------- */ @@ -4150,18 +4150,18 @@ static void transform_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t } static bConstraintTypeInfo CTI_TRANSFORM = { - CONSTRAINT_TYPE_TRANSFORM, /* type */ - sizeof(bTransformConstraint), /* size */ - N_("Transformation"), /* name */ - "bTransformConstraint", /* struct name */ - NULL, /* free data */ - transform_id_looper, /* id looper */ - NULL, /* copy data */ - transform_new_data, /* new data */ - transform_get_tars, /* get constraint targets */ - transform_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get a target matrix */ - transform_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_TRANSFORM, + /*size*/ sizeof(bTransformConstraint), + /*name*/ N_("Transformation"), + /*structName*/ "bTransformConstraint", + /*free_data*/ NULL, + /*id_looper*/ transform_id_looper, + /*copy_data*/ NULL, + /*new_data*/ transform_new_data, + /*get_constraint_targets*/ transform_get_tars, + /*flush_constraint_targets*/ transform_flush_tars, + /* get a target matrix */ default_get_tarmat, + /*evaluate_constraint*/ transform_evaluate, }; /* ---------- Shrinkwrap Constraint ----------- */ @@ -4381,18 +4381,18 @@ static void shrinkwrap_evaluate(bConstraint *UNUSED(con), bConstraintOb *cob, Li } static bConstraintTypeInfo CTI_SHRINKWRAP = { - CONSTRAINT_TYPE_SHRINKWRAP, /* type */ - sizeof(bShrinkwrapConstraint), /* size */ - N_("Shrinkwrap"), /* name */ - "bShrinkwrapConstraint", /* struct name */ - NULL, /* free data */ - shrinkwrap_id_looper, /* id looper */ - NULL, /* copy data */ - shrinkwrap_new_data, /* new data */ - shrinkwrap_get_tars, /* get constraint targets */ - shrinkwrap_flush_tars, /* flush constraint targets */ - shrinkwrap_get_tarmat, /* get a target matrix */ - shrinkwrap_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_SHRINKWRAP, + /*size*/ sizeof(bShrinkwrapConstraint), + /*name*/ N_("Shrinkwrap"), + /*structName*/ "bShrinkwrapConstraint", + /*free_data*/ NULL, + /*id_looper*/ shrinkwrap_id_looper, + /*copy_data*/ NULL, + /*new_data*/ shrinkwrap_new_data, + /*get_constraint_targets*/ shrinkwrap_get_tars, + /*flush_constraint_targets*/ shrinkwrap_flush_tars, + /* get a target matrix */ shrinkwrap_get_tarmat, + /*evaluate_constraint*/ shrinkwrap_evaluate, }; /* --------- Damped Track ---------- */ @@ -4546,18 +4546,18 @@ static void damptrack_do_transform(float matrix[4][4], const float tarvec_in[3], } static bConstraintTypeInfo CTI_DAMPTRACK = { - CONSTRAINT_TYPE_DAMPTRACK, /* type */ - sizeof(bDampTrackConstraint), /* size */ - N_("Damped Track"), /* name */ - "bDampTrackConstraint", /* struct name */ - NULL, /* free data */ - damptrack_id_looper, /* id looper */ - NULL, /* copy data */ - damptrack_new_data, /* new data */ - damptrack_get_tars, /* get constraint targets */ - damptrack_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - damptrack_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_DAMPTRACK, + /*size*/ sizeof(bDampTrackConstraint), + /*name*/ N_("Damped Track"), + /*structName*/ "bDampTrackConstraint", + /*free_data*/ NULL, + /*id_looper*/ damptrack_id_looper, + /*copy_data*/ NULL, + /*new_data*/ damptrack_new_data, + /*get_constraint_targets*/ damptrack_get_tars, + /*flush_constraint_targets*/ damptrack_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ damptrack_evaluate, }; /* ----------- Spline IK ------------ */ @@ -4641,18 +4641,18 @@ static void splineik_get_tarmat(struct Depsgraph *UNUSED(depsgraph), } static bConstraintTypeInfo CTI_SPLINEIK = { - CONSTRAINT_TYPE_SPLINEIK, /* type */ - sizeof(bSplineIKConstraint), /* size */ - N_("Spline IK"), /* name */ - "bSplineIKConstraint", /* struct name */ - splineik_free, /* free data */ - splineik_id_looper, /* id looper */ - splineik_copy, /* copy data */ - splineik_new_data, /* new data */ - splineik_get_tars, /* get constraint targets */ - splineik_flush_tars, /* flush constraint targets */ - splineik_get_tarmat, /* get target matrix */ - NULL, /* evaluate - solved as separate loop */ + /*type*/ CONSTRAINT_TYPE_SPLINEIK, + /*size*/ sizeof(bSplineIKConstraint), + /*name*/ N_("Spline IK"), + /*structName*/ "bSplineIKConstraint", + /*free_data*/ splineik_free, + /*id_looper*/ splineik_id_looper, + /*copy_data*/ splineik_copy, + /*new_data*/ splineik_new_data, + /*get_constraint_targets*/ splineik_get_tars, + /*flush_constraint_targets*/ splineik_flush_tars, + /*get_target_matrix*/ splineik_get_tarmat, + /* evaluate - solved as separate loop */ NULL, }; /* ----------- Pivot ------------- */ @@ -4765,19 +4765,19 @@ static void pivotcon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *ta } static bConstraintTypeInfo CTI_PIVOT = { - CONSTRAINT_TYPE_PIVOT, /* type */ - sizeof(bPivotConstraint), /* size */ - N_("Pivot"), /* name */ - "bPivotConstraint", /* struct name */ - NULL, /* free data */ - pivotcon_id_looper, /* id looper */ - NULL, /* copy data */ - NULL, - /* new data */ /* XXX: might be needed to get 'normal' pivot behavior... */ - pivotcon_get_tars, /* get constraint targets */ - pivotcon_flush_tars, /* flush constraint targets */ - default_get_tarmat, /* get target matrix */ - pivotcon_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_PIVOT, + /*size*/ sizeof(bPivotConstraint), + /*name*/ N_("Pivot"), + /*structName*/ "bPivotConstraint", + /*free_data*/ NULL, + /*id_looper*/ pivotcon_id_looper, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /* XXX: might be needed to get 'normal' pivot behavior. */ + /*get_constraint_targets*/ pivotcon_get_tars, + /*flush_constraint_targets*/ pivotcon_flush_tars, + /*get_target_matrix*/ default_get_tarmat, + /*evaluate_constraint*/ pivotcon_evaluate, }; /* ----------- Follow Track ------------- */ @@ -5185,18 +5185,18 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase } static bConstraintTypeInfo CTI_FOLLOWTRACK = { - CONSTRAINT_TYPE_FOLLOWTRACK, /* type */ - sizeof(bFollowTrackConstraint), /* size */ - N_("Follow Track"), /* name */ - "bFollowTrackConstraint", /* struct name */ - NULL, /* free data */ - followtrack_id_looper, /* id looper */ - NULL, /* copy data */ - followtrack_new_data, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - followtrack_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_FOLLOWTRACK, + /*size*/ sizeof(bFollowTrackConstraint), + /*name*/ N_("Follow Track"), + /*structName*/ "bFollowTrackConstraint", + /*free_data*/ NULL, + /*id_looper*/ followtrack_id_looper, + /*copy_data*/ NULL, + /*new_data*/ followtrack_new_data, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ followtrack_evaluate, }; /* ----------- Camera Solver ------------- */ @@ -5243,18 +5243,18 @@ static void camerasolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase } static bConstraintTypeInfo CTI_CAMERASOLVER = { - CONSTRAINT_TYPE_CAMERASOLVER, /* type */ - sizeof(bCameraSolverConstraint), /* size */ - N_("Camera Solver"), /* name */ - "bCameraSolverConstraint", /* struct name */ - NULL, /* free data */ - camerasolver_id_looper, /* id looper */ - NULL, /* copy data */ - camerasolver_new_data, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - camerasolver_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_CAMERASOLVER, + /*size*/ sizeof(bCameraSolverConstraint), + /*name*/ N_("Camera Solver"), + /*structName*/ "bCameraSolverConstraint", + /*free_data*/ NULL, + /*id_looper*/ camerasolver_id_looper, + /*copy_data*/ NULL, + /*new_data*/ camerasolver_new_data, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ camerasolver_evaluate, }; /* ----------- Object Solver ------------- */ @@ -5329,18 +5329,18 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase } static bConstraintTypeInfo CTI_OBJECTSOLVER = { - CONSTRAINT_TYPE_OBJECTSOLVER, /* type */ - sizeof(bObjectSolverConstraint), /* size */ - N_("Object Solver"), /* name */ - "bObjectSolverConstraint", /* struct name */ - NULL, /* free data */ - objectsolver_id_looper, /* id looper */ - NULL, /* copy data */ - objectsolver_new_data, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - objectsolver_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_OBJECTSOLVER, + /*size*/ sizeof(bObjectSolverConstraint), + /*name*/ N_("Object Solver"), + /*structName*/ "bObjectSolverConstraint", + /*free_data*/ NULL, + /*id_looper*/ objectsolver_id_looper, + /*copy_data*/ NULL, + /*new_data*/ objectsolver_new_data, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ objectsolver_evaluate, }; /* ----------- Transform Cache ------------- */ @@ -5426,18 +5426,18 @@ static void transformcache_new_data(void *cdata) } static bConstraintTypeInfo CTI_TRANSFORM_CACHE = { - CONSTRAINT_TYPE_TRANSFORM_CACHE, /* type */ - sizeof(bTransformCacheConstraint), /* size */ - N_("Transform Cache"), /* name */ - "bTransformCacheConstraint", /* struct name */ - transformcache_free, /* free data */ - transformcache_id_looper, /* id looper */ - transformcache_copy, /* copy data */ - transformcache_new_data, /* new data */ - NULL, /* get constraint targets */ - NULL, /* flush constraint targets */ - NULL, /* get target matrix */ - transformcache_evaluate, /* evaluate */ + /*type*/ CONSTRAINT_TYPE_TRANSFORM_CACHE, + /*size*/ sizeof(bTransformCacheConstraint), + /*name*/ N_("Transform Cache"), + /*structName*/ "bTransformCacheConstraint", + /*free_data*/ transformcache_free, + /*id_looper*/ transformcache_id_looper, + /*copy_data*/ transformcache_copy, + /*new_data*/ transformcache_new_data, + /*get_constraint_targets*/ NULL, + /*flush_constraint_targets*/ NULL, + /*get_target_matrix*/ NULL, + /*evaluate_constraint*/ transformcache_evaluate, }; /* ************************* Constraints Type-Info *************************** */ diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 139d4a45553..be6c7502891 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -304,33 +304,33 @@ static void curve_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_CU_LEGACY = { - /* id_code */ ID_CU_LEGACY, - /* id_filter */ FILTER_ID_CU_LEGACY, - /* main_listbase_index */ INDEX_ID_CU_LEGACY, - /* struct_size */ sizeof(Curve), - /* name */ "Curve", - /* name_plural */ "curves", - /* translation_context */ BLT_I18NCONTEXT_ID_CURVE_LEGACY, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_CU_LEGACY, + /*id_filter*/ FILTER_ID_CU_LEGACY, + /*main_listbase_index*/ INDEX_ID_CU_LEGACY, + /*struct_size*/ sizeof(Curve), + /*name*/ "Curve", + /*name_plural*/ "curves", + /*translation_context*/ BLT_I18NCONTEXT_ID_CURVE_LEGACY, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ curve_init_data, - /* copy_data */ curve_copy_data, - /* free_data */ curve_free_data, - /* make_local */ nullptr, - /* foreach_id */ curve_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ curve_init_data, + /*copy_data*/ curve_copy_data, + /*free_data*/ curve_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ curve_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ curve_blend_write, - /* blend_read_data */ curve_blend_read_data, - /* blend_read_lib */ curve_blend_read_lib, - /* blend_read_expand */ curve_blend_read_expand, + /*blend_write*/ curve_blend_write, + /*blend_read_data*/ curve_blend_read_data, + /*blend_read_lib*/ curve_blend_read_lib, + /*blend_read_expand*/ curve_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; void BKE_curve_editfont_free(Curve *cu) diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc index 84ffb5e5314..0bdddc9c389 100644 --- a/source/blender/blenkernel/intern/curves.cc +++ b/source/blender/blenkernel/intern/curves.cc @@ -199,33 +199,33 @@ static void curves_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_CV = { - /* id_code */ ID_CV, - /* id_filter */ FILTER_ID_CV, - /* main_listbase_index */ INDEX_ID_CV, - /* struct_size */ sizeof(Curves), - /* name */ "Curves", - /* name_plural */ "hair_curves", - /* translation_context */ BLT_I18NCONTEXT_ID_CURVES, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_CV, + /*id_filter*/ FILTER_ID_CV, + /*main_listbase_index*/ INDEX_ID_CV, + /*struct_size*/ sizeof(Curves), + /*name*/ "Curves", + /*name_plural*/ "hair_curves", + /*translation_context*/ BLT_I18NCONTEXT_ID_CURVES, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ curves_init_data, - /* copy_data */ curves_copy_data, - /* free_data */ curves_free_data, - /* make_local */ nullptr, - /* foreach_id */ curves_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ curves_init_data, + /*copy_data*/ curves_copy_data, + /*free_data*/ curves_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ curves_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ curves_blend_write, - /* blend_read_data */ curves_blend_read_data, - /* blend_read_lib */ curves_blend_read_lib, - /* blend_read_expand */ curves_blend_read_expand, + /*blend_write*/ curves_blend_write, + /*blend_read_data*/ curves_blend_read_data, + /*blend_read_lib*/ curves_blend_read_lib, + /*blend_read_expand*/ curves_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; void *BKE_curves_add(Main *bmain, const char *name) diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index a8b8782062e..b9e6b1c5e6d 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -2028,71 +2028,70 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = { }; const CustomData_MeshMasks CD_MASK_BAREMESH = { - /* vmask */ CD_MASK_PROP_FLOAT3, - /* emask */ CD_MASK_MEDGE, - /* fmask */ 0, - /* pmask */ CD_MASK_MPOLY | CD_MASK_FACEMAP, - /* lmask */ CD_MASK_MLOOP, + /*vmask*/ CD_MASK_PROP_FLOAT3, + /*emask*/ CD_MASK_MEDGE, + /*fmask*/ 0, + /*pmask*/ CD_MASK_MPOLY | CD_MASK_FACEMAP, + /*lmask*/ CD_MASK_MLOOP, }; const CustomData_MeshMasks CD_MASK_BAREMESH_ORIGINDEX = { - /* vmask */ CD_MASK_PROP_FLOAT3 | CD_MASK_ORIGINDEX, - /* emask */ CD_MASK_MEDGE | CD_MASK_ORIGINDEX, - /* fmask */ 0, - /* pmask */ CD_MASK_MPOLY | CD_MASK_FACEMAP | CD_MASK_ORIGINDEX, - /* lmask */ CD_MASK_MLOOP, + /*vmask*/ CD_MASK_PROP_FLOAT3 | CD_MASK_ORIGINDEX, + /*emask*/ CD_MASK_MEDGE | CD_MASK_ORIGINDEX, + /*fmask*/ 0, + /*pmask*/ CD_MASK_MPOLY | CD_MASK_FACEMAP | CD_MASK_ORIGINDEX, + /*lmask*/ CD_MASK_MLOOP, }; const CustomData_MeshMasks CD_MASK_MESH = { - /* vmask */ (CD_MASK_PROP_FLOAT3 | CD_MASK_MDEFORMVERT | CD_MASK_MVERT_SKIN | - CD_MASK_PAINT_MASK | CD_MASK_PROP_ALL | CD_MASK_CREASE | CD_MASK_BWEIGHT), - /* emask */ + /*vmask*/ (CD_MASK_PROP_FLOAT3 | CD_MASK_MDEFORMVERT | CD_MASK_MVERT_SKIN | + CD_MASK_PAINT_MASK | CD_MASK_PROP_ALL | CD_MASK_CREASE | CD_MASK_BWEIGHT), + /*emask*/ (CD_MASK_MEDGE | CD_MASK_FREESTYLE_EDGE | CD_MASK_PROP_ALL | CD_MASK_BWEIGHT | CD_MASK_CREASE), - /* fmask */ 0, - /* pmask */ + /*fmask*/ 0, + /*pmask*/ (CD_MASK_MPOLY | CD_MASK_FACEMAP | CD_MASK_FREESTYLE_FACE | CD_MASK_PROP_ALL), - /* lmask */ + /*lmask*/ (CD_MASK_MLOOP | CD_MASK_MDISPS | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_GRID_PAINT_MASK | CD_MASK_PROP_ALL), }; const CustomData_MeshMasks CD_MASK_DERIVEDMESH = { - /* vmask */ (CD_MASK_ORIGINDEX | CD_MASK_MDEFORMVERT | CD_MASK_SHAPEKEY | CD_MASK_MVERT_SKIN | - CD_MASK_PAINT_MASK | CD_MASK_ORCO | CD_MASK_CLOTH_ORCO | CD_MASK_PROP_ALL | - CD_MASK_CREASE | CD_MASK_BWEIGHT), - /* emask */ + /*vmask*/ (CD_MASK_ORIGINDEX | CD_MASK_MDEFORMVERT | CD_MASK_SHAPEKEY | CD_MASK_MVERT_SKIN | + CD_MASK_PAINT_MASK | CD_MASK_ORCO | CD_MASK_CLOTH_ORCO | CD_MASK_PROP_ALL | + CD_MASK_CREASE | CD_MASK_BWEIGHT), + /*emask*/ (CD_MASK_ORIGINDEX | CD_MASK_FREESTYLE_EDGE | CD_MASK_BWEIGHT | CD_MASK_PROP_ALL | CD_MASK_CREASE), - /* fmask */ (CD_MASK_ORIGINDEX | CD_MASK_ORIGSPACE | CD_MASK_PREVIEW_MCOL | CD_MASK_TANGENT), - /* pmask */ + /*fmask*/ (CD_MASK_ORIGINDEX | CD_MASK_ORIGSPACE | CD_MASK_PREVIEW_MCOL | CD_MASK_TANGENT), + /*pmask*/ (CD_MASK_ORIGINDEX | CD_MASK_FREESTYLE_FACE | CD_MASK_FACEMAP | CD_MASK_PROP_ALL), - /* lmask */ + /*lmask*/ (CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_PREVIEW_MLOOPCOL | CD_MASK_ORIGSPACE_MLOOP | - CD_MASK_PROP_ALL), /* XXX MISSING CD_MASK_MLOOPTANGENT ? */ + CD_MASK_PROP_ALL), /* XXX: MISSING #CD_MASK_MLOOPTANGENT ? */ }; const CustomData_MeshMasks CD_MASK_BMESH = { - /* vmask */ (CD_MASK_MDEFORMVERT | CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_SHAPEKEY | - CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK | CD_MASK_PROP_ALL | CD_MASK_CREASE), - /* emask */ (CD_MASK_BWEIGHT | CD_MASK_CREASE | CD_MASK_FREESTYLE_EDGE | CD_MASK_PROP_ALL), - /* fmask */ 0, - /* pmask */ + /*vmask*/ (CD_MASK_MDEFORMVERT | CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_SHAPEKEY | + CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK | CD_MASK_PROP_ALL | CD_MASK_CREASE), + /*emask*/ (CD_MASK_BWEIGHT | CD_MASK_CREASE | CD_MASK_FREESTYLE_EDGE | CD_MASK_PROP_ALL), + /*fmask*/ 0, + /*pmask*/ (CD_MASK_FREESTYLE_FACE | CD_MASK_FACEMAP | CD_MASK_PROP_ALL), - /* lmask */ + /*lmask*/ (CD_MASK_MDISPS | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_GRID_PAINT_MASK | CD_MASK_PROP_ALL), }; const CustomData_MeshMasks CD_MASK_EVERYTHING = { - /* vmask */ (CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_MDEFORMVERT | - CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_ORCO | CD_MASK_CLOTH_ORCO | - CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK | - CD_MASK_PROP_ALL | CD_MASK_CREASE), - /* emask */ + /*vmask*/ (CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_MDEFORMVERT | CD_MASK_BWEIGHT | + CD_MASK_MVERT_SKIN | CD_MASK_ORCO | CD_MASK_CLOTH_ORCO | CD_MASK_SHAPEKEY | + CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK | CD_MASK_PROP_ALL | CD_MASK_CREASE), + /*emask*/ (CD_MASK_MEDGE | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_BWEIGHT | CD_MASK_CREASE | CD_MASK_FREESTYLE_EDGE | CD_MASK_PROP_ALL), - /* fmask */ + /*fmask*/ (CD_MASK_MFACE | CD_MASK_ORIGINDEX | CD_MASK_NORMAL | CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_ORIGSPACE | CD_MASK_TANGENT | CD_MASK_TESSLOOPNORMAL | CD_MASK_PREVIEW_MCOL | CD_MASK_PROP_ALL), - /* pmask */ + /*pmask*/ (CD_MASK_MPOLY | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_FACEMAP | CD_MASK_FREESTYLE_FACE | CD_MASK_PROP_ALL), - /* lmask */ + /*lmask*/ (CD_MASK_MLOOP | CD_MASK_BM_ELEM_PYPTR | CD_MASK_MDISPS | CD_MASK_NORMAL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_MLOOPTANGENT | CD_MASK_PREVIEW_MLOOPCOL | CD_MASK_ORIGSPACE_MLOOP | CD_MASK_GRID_PAINT_MASK | CD_MASK_PROP_ALL), diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 46dc01edbff..46828a43818 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -61,20 +61,19 @@ static CLG_LogRef LOG = {"bke.fmodifier"}; */ #if 0 static FModifierTypeInfo FMI_MODNAME = { - FMODIFIER_TYPE_MODNAME, /* type */ - sizeof(FMod_ModName), /* size */ - FMI_TYPE_SOME_ACTION, /* action type */ - FMI_REQUIRES_SOME_REQUIREMENT, /* requirements */ - "Modifier Name", /* name */ - "FMod_ModName", /* struct name */ - 0, /* storage size */ - fcm_modname_free, /* free data */ - fcm_modname_relink, /* relink data */ - fcm_modname_copy, /* copy data */ - fcm_modname_new_data, /* new data */ - fcm_modname_verify, /* verify */ - fcm_modname_time, /* evaluate time */ - fcm_modname_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_MODNAME, + /*size*/ sizeof(FMod_ModName), + /*acttype*/ FMI_TYPE_SOME_ACTION, + /*requires*/ FMI_REQUIRES_SOME_REQUIREMENT, + /*name*/ "Modifier Name", + /*structName*/ "FMod_ModName", + /*storage_size*/ 0, + /*free_data*/ fcm_modname_free, + /*copy_data*/ fcm_modname_copy, + /*new_data*/ fcm_modname_new_data, + /*verify_data*/ fcm_modname_verify, + /*evaluate_modifier_time*/ fcm_modname_time, + /*evaluate_modifier*/ fcm_modname_evaluate, }; #endif @@ -226,19 +225,19 @@ static void fcm_generator_evaluate( } static FModifierTypeInfo FMI_GENERATOR = { - FMODIFIER_TYPE_GENERATOR, /* type */ - sizeof(FMod_Generator), /* size */ - FMI_TYPE_GENERATE_CURVE, /* action type */ - FMI_REQUIRES_NOTHING, /* requirements */ - N_("Generator"), /* name */ - "FMod_Generator", /* struct name */ - 0, /* storage size */ - fcm_generator_free, /* free data */ - fcm_generator_copy, /* copy data */ - fcm_generator_new_data, /* new data */ - fcm_generator_verify, /* verify */ - NULL, /* evaluate time */ - fcm_generator_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_GENERATOR, + /*size*/ sizeof(FMod_Generator), + /*acttype*/ FMI_TYPE_GENERATE_CURVE, + /*requires*/ FMI_REQUIRES_NOTHING, + /*name*/ N_("Generator"), + /*structName*/ "FMod_Generator", + /*storage_size*/ 0, + /*free_data*/ fcm_generator_free, + /*copy_data*/ fcm_generator_copy, + /*new_data*/ fcm_generator_new_data, + /*verify_data*/ fcm_generator_verify, + /*evaluate_modifier_time*/ NULL, + /*evaluate_modifier*/ fcm_generator_evaluate, }; /* Built-In Function Generator F-Curve Modifier --------------------------- */ @@ -356,19 +355,19 @@ static void fcm_fn_generator_evaluate( } static FModifierTypeInfo FMI_FN_GENERATOR = { - FMODIFIER_TYPE_FN_GENERATOR, /* type */ - sizeof(FMod_FunctionGenerator), /* size */ - FMI_TYPE_GENERATE_CURVE, /* action type */ - FMI_REQUIRES_NOTHING, /* requirements */ - N_("Built-In Function"), /* name */ - "FMod_FunctionGenerator", /* struct name */ - 0, /* storage size */ - NULL, /* free data */ - NULL, /* copy data */ - fcm_fn_generator_new_data, /* new data */ - NULL, /* verify */ - NULL, /* evaluate time */ - fcm_fn_generator_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_FN_GENERATOR, + /*size*/ sizeof(FMod_FunctionGenerator), + /*acttype*/ FMI_TYPE_GENERATE_CURVE, + /*requires*/ FMI_REQUIRES_NOTHING, + /*name*/ N_("Built-In Function"), + /*structName*/ "FMod_FunctionGenerator", + /*storage_size*/ 0, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ fcm_fn_generator_new_data, + /*verify_data*/ NULL, + /*evaluate_modifier_time*/ NULL, + /*evaluate_modifier*/ fcm_fn_generator_evaluate, }; /* Envelope F-Curve Modifier --------------------------- */ @@ -469,19 +468,19 @@ static void fcm_envelope_evaluate( } static FModifierTypeInfo FMI_ENVELOPE = { - FMODIFIER_TYPE_ENVELOPE, /* type */ - sizeof(FMod_Envelope), /* size */ - FMI_TYPE_REPLACE_VALUES, /* action type */ - 0, /* requirements */ - N_("Envelope"), /* name */ - "FMod_Envelope", /* struct name */ - 0, /* storage size */ - fcm_envelope_free, /* free data */ - fcm_envelope_copy, /* copy data */ - fcm_envelope_new_data, /* new data */ - fcm_envelope_verify, /* verify */ - NULL, /* evaluate time */ - fcm_envelope_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_ENVELOPE, + /*size*/ sizeof(FMod_Envelope), + /*acttype*/ FMI_TYPE_REPLACE_VALUES, + /*requires*/ 0, + /*name*/ N_("Envelope"), + /*structName*/ "FMod_Envelope", + /*storage_size*/ 0, + /*free_data*/ fcm_envelope_free, + /*copy_data*/ fcm_envelope_copy, + /*new_data*/ fcm_envelope_new_data, + /*verify_data*/ fcm_envelope_verify, + /*evaluate_modifier_time*/ NULL, + /*evaluate_modifier*/ fcm_envelope_evaluate, }; /* exported function for finding points */ @@ -768,19 +767,19 @@ static void fcm_cycles_evaluate(FCurve *UNUSED(fcu), } static FModifierTypeInfo FMI_CYCLES = { - FMODIFIER_TYPE_CYCLES, /* type */ - sizeof(FMod_Cycles), /* size */ - FMI_TYPE_EXTRAPOLATION, /* action type */ - FMI_REQUIRES_ORIGINAL_DATA, /* requirements */ - CTX_N_(BLT_I18NCONTEXT_ID_ACTION, "Cycles"), /* name */ - "FMod_Cycles", /* struct name */ - sizeof(tFCMED_Cycles), /* storage size */ - NULL, /* free data */ - NULL, /* copy data */ - fcm_cycles_new_data, /* new data */ - NULL /*fcm_cycles_verify*/, /* verify */ - fcm_cycles_time, /* evaluate time */ - fcm_cycles_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_CYCLES, + /*size*/ sizeof(FMod_Cycles), + /*acttype*/ FMI_TYPE_EXTRAPOLATION, + /*requires*/ FMI_REQUIRES_ORIGINAL_DATA, + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_ACTION, "Cycles"), + /*structName*/ "FMod_Cycles", + /*storage_size*/ sizeof(tFCMED_Cycles), + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ fcm_cycles_new_data, + /*verify_data*/ NULL /*fcm_cycles_verify*/, + /*evaluate_modifier_time*/ fcm_cycles_time, + /*evaluate_modifier*/ fcm_cycles_evaluate, }; /* Noise F-Curve Modifier --------------------------- */ @@ -830,19 +829,19 @@ static void fcm_noise_evaluate( } static FModifierTypeInfo FMI_NOISE = { - FMODIFIER_TYPE_NOISE, /* type */ - sizeof(FMod_Noise), /* size */ - FMI_TYPE_REPLACE_VALUES, /* action type */ - 0, /* requirements */ - N_("Noise"), /* name */ - "FMod_Noise", /* struct name */ - 0, /* storage size */ - NULL, /* free data */ - NULL, /* copy data */ - fcm_noise_new_data, /* new data */ - NULL /*fcm_noise_verify*/, /* verify */ - NULL, /* evaluate time */ - fcm_noise_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_NOISE, + /*size*/ sizeof(FMod_Noise), + /*acttype*/ FMI_TYPE_REPLACE_VALUES, + /*requires*/ 0, + /*name*/ N_("Noise"), + /*structName*/ "FMod_Noise", + /*storage_size*/ 0, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ fcm_noise_new_data, + /*verify_data*/ NULL /*fcm_noise_verify*/, + /*evaluate_modifier_time*/ NULL, + /*evaluate_modifier*/ fcm_noise_evaluate, }; /* Python F-Curve Modifier --------------------------- */ @@ -888,19 +887,19 @@ static void fcm_python_evaluate(FCurve *UNUSED(fcu), } static FModifierTypeInfo FMI_PYTHON = { - FMODIFIER_TYPE_PYTHON, /* type */ - sizeof(FMod_Python), /* size */ - FMI_TYPE_GENERATE_CURVE, /* action type */ - FMI_REQUIRES_RUNTIME_CHECK, /* requirements */ - N_("Python"), /* name */ - "FMod_Python", /* struct name */ - 0, /* storage size */ - fcm_python_free, /* free data */ - fcm_python_copy, /* copy data */ - fcm_python_new_data, /* new data */ - NULL /*fcm_python_verify*/, /* verify */ - NULL /*fcm_python_time*/, /* evaluate time */ - fcm_python_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_PYTHON, + /*size*/ sizeof(FMod_Python), + /*acttype*/ FMI_TYPE_GENERATE_CURVE, + /*requires*/ FMI_REQUIRES_RUNTIME_CHECK, + /*name*/ N_("Python"), + /*structName*/ "FMod_Python", + /*storage_size*/ 0, + /*free_data*/ fcm_python_free, + /*copy_data*/ fcm_python_copy, + /*new_data*/ fcm_python_new_data, + /*verify_data*/ NULL /*fcm_python_verify*/, + /*evaluate_modifier_time*/ NULL /*fcm_python_time*/, + /*evaluate_modifier*/ fcm_python_evaluate, }; /* Limits F-Curve Modifier --------------------------- */ @@ -943,20 +942,19 @@ static void fcm_limits_evaluate(FCurve *UNUSED(fcu), } static FModifierTypeInfo FMI_LIMITS = { - FMODIFIER_TYPE_LIMITS, /* type */ - sizeof(FMod_Limits), /* size */ - FMI_TYPE_GENERATE_CURVE, - /* action type */ /* XXX... err... */ - FMI_REQUIRES_RUNTIME_CHECK, /* requirements */ - N_("Limits"), /* name */ - "FMod_Limits", /* struct name */ - 0, /* storage size */ - NULL, /* free data */ - NULL, /* copy data */ - NULL, /* new data */ - NULL, /* verify */ - fcm_limits_time, /* evaluate time */ - fcm_limits_evaluate, /* evaluate */ + /*type*/ FMODIFIER_TYPE_LIMITS, + /*size*/ sizeof(FMod_Limits), + /*acttype*/ FMI_TYPE_GENERATE_CURVE, + /*requires*/ FMI_REQUIRES_RUNTIME_CHECK, /* XXX... err... */ + /*name*/ N_("Limits"), + /*structName*/ "FMod_Limits", + /*storage_size*/ 0, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ NULL, + /*verify_data*/ NULL, + /*evaluate_modifier_time*/ fcm_limits_time, + /*evaluate_modifier*/ fcm_limits_evaluate, }; /* Stepped F-Curve Modifier --------------------------- */ @@ -1004,20 +1002,19 @@ static float fcm_stepped_time(FCurve *UNUSED(fcu), } static FModifierTypeInfo FMI_STEPPED = { - FMODIFIER_TYPE_STEPPED, /* type */ - sizeof(FMod_Limits), /* size */ - FMI_TYPE_GENERATE_CURVE, - /* action type */ /* XXX... err... */ - FMI_REQUIRES_RUNTIME_CHECK, /* requirements */ - N_("Stepped"), /* name */ - "FMod_Stepped", /* struct name */ - 0, /* storage size */ - NULL, /* free data */ - NULL, /* copy data */ - fcm_stepped_new_data, /* new data */ - NULL, /* verify */ - fcm_stepped_time, /* evaluate time */ - NULL, /* evaluate */ + /*type*/ FMODIFIER_TYPE_STEPPED, + /*size*/ sizeof(FMod_Limits), + /*acttype*/ FMI_TYPE_GENERATE_CURVE, + /*requires*/ FMI_REQUIRES_RUNTIME_CHECK, /* XXX... err... */ + /*name*/ N_("Stepped"), + /*structName*/ "FMod_Stepped", + /*storage_size*/ 0, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*new_data*/ fcm_stepped_new_data, + /*verify_data*/ NULL, + /*evaluate_modifier_time*/ fcm_stepped_time, + /*evaluate_modifier*/ NULL, }; /** \} */ diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc index 4b3a42e4c8a..57d040c5c4f 100644 --- a/source/blender/blenkernel/intern/key.cc +++ b/source/blender/blenkernel/intern/key.cc @@ -195,35 +195,35 @@ static void shapekey_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_KE = { - /* id_code */ ID_KE, - /* id_filter */ FILTER_ID_KE, - /* main_listbase_index */ INDEX_ID_KE, - /* struct_size */ sizeof(Key), - /* name */ "Key", - /* name_plural */ "shape_keys", - /* translation_context */ BLT_I18NCONTEXT_ID_SHAPEKEY, - /* flags */ IDTYPE_FLAGS_NO_LIBLINKING, - /* asset_type_info */ nullptr, + /*id_code*/ ID_KE, + /*id_filter*/ FILTER_ID_KE, + /*main_listbase_index*/ INDEX_ID_KE, + /*struct_size*/ sizeof(Key), + /*name*/ "Key", + /*name_plural*/ "shape_keys", + /*translation_context*/ BLT_I18NCONTEXT_ID_SHAPEKEY, + /*flags*/ IDTYPE_FLAGS_NO_LIBLINKING, + /*asset_type_info*/ nullptr, - /* init_data */ nullptr, - /* copy_data */ shapekey_copy_data, - /* free_data */ shapekey_free_data, - /* make_local */ nullptr, - /* foreach_id */ shapekey_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, + /*init_data*/ nullptr, + /*copy_data*/ shapekey_copy_data, + /*free_data*/ shapekey_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ shapekey_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, /* A bit weird, due to shape-keys not being strictly speaking embedded data... But they also * share a lot with those (non linkable, only ever used by one owner ID, etc.). */ - /* owner_pointer_get */ shapekey_owner_pointer_get, + /*owner_pointer_get*/ shapekey_owner_pointer_get, - /* blend_write */ shapekey_blend_write, - /* blend_read_data */ shapekey_blend_read_data, - /* blend_read_lib */ shapekey_blend_read_lib, - /* blend_read_expand */ shapekey_blend_read_expand, + /*blend_write*/ shapekey_blend_write, + /*blend_read_data*/ shapekey_blend_read_data, + /*blend_read_lib*/ shapekey_blend_read_lib, + /*blend_read_expand*/ shapekey_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; #define KEY_MODE_DUMMY 0 /* use where mode isn't checked for */ diff --git a/source/blender/blenkernel/intern/linestyle.cc b/source/blender/blenkernel/intern/linestyle.cc index 3976331d599..a08e7f34e1d 100644 --- a/source/blender/blenkernel/intern/linestyle.cc +++ b/source/blender/blenkernel/intern/linestyle.cc @@ -732,33 +732,33 @@ static void linestyle_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_LS = { - /* id_code */ ID_LS, - /* id_filter */ FILTER_ID_LS, - /* main_listbase_index */ INDEX_ID_LS, - /* struct_size */ sizeof(FreestyleLineStyle), - /* name */ "FreestyleLineStyle", - /* name_plural */ "linestyles", - /* translation_context */ BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_LS, + /*id_filter*/ FILTER_ID_LS, + /*main_listbase_index*/ INDEX_ID_LS, + /*struct_size*/ sizeof(FreestyleLineStyle), + /*name*/ "FreestyleLineStyle", + /*name_plural*/ "linestyles", + /*translation_context*/ BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ linestyle_init_data, - /* copy_data */ linestyle_copy_data, - /* free_data */ linestyle_free_data, - /* make_local */ nullptr, - /* foreach_id */ linestyle_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ linestyle_init_data, + /*copy_data*/ linestyle_copy_data, + /*free_data*/ linestyle_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ linestyle_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ linestyle_blend_write, - /* blend_read_data */ linestyle_blend_read_data, - /* blend_read_lib */ linestyle_blend_read_lib, - /* blend_read_expand */ linestyle_blend_read_expand, + /*blend_write*/ linestyle_blend_write, + /*blend_read_data*/ linestyle_blend_read_data, + /*blend_read_lib*/ linestyle_blend_read_lib, + /*blend_read_expand*/ linestyle_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; static const char *modifier_name[LS_MODIFIER_NUM] = { diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index 58478dce847..0fd3ec4f8cd 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -243,33 +243,33 @@ static void material_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_MA = { - /* id_code */ ID_MA, - /* id_filter */ FILTER_ID_MA, - /* main_listbase_index */ INDEX_ID_MA, - /* struct_size */ sizeof(Material), - /* name */ "Material", - /* name_plural */ "materials", - /* translation_context */ BLT_I18NCONTEXT_ID_MATERIAL, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_MA, + /*id_filter*/ FILTER_ID_MA, + /*main_listbase_index*/ INDEX_ID_MA, + /*struct_size*/ sizeof(Material), + /*name*/ "Material", + /*name_plural*/ "materials", + /*translation_context*/ BLT_I18NCONTEXT_ID_MATERIAL, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ material_init_data, - /* copy_data */ material_copy_data, - /* free_data */ material_free_data, - /* make_local */ nullptr, - /* foreach_id */ material_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ material_init_data, + /*copy_data*/ material_copy_data, + /*free_data*/ material_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ material_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ material_blend_write, - /* blend_read_data */ material_blend_read_data, - /* blend_read_lib */ material_blend_read_lib, - /* blend_read_expand */ material_blend_read_expand, + /*blend_write*/ material_blend_write, + /*blend_read_data*/ material_blend_read_data, + /*blend_read_lib*/ material_blend_read_lib, + /*blend_read_expand*/ material_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; void BKE_gpencil_material_attr_init(Material *ma) diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index 6b1394f65ab..c1421db913d 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -161,33 +161,33 @@ static void metaball_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_MB = { - /* id_code */ ID_MB, - /* id_filter */ FILTER_ID_MB, - /* main_listbase_index */ INDEX_ID_MB, - /* struct_size */ sizeof(MetaBall), - /* name */ "Metaball", - /* name_plural */ "metaballs", - /* translation_context */ BLT_I18NCONTEXT_ID_METABALL, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_MB, + /*id_filter*/ FILTER_ID_MB, + /*main_listbase_index*/ INDEX_ID_MB, + /*struct_size*/ sizeof(MetaBall), + /*name*/ "Metaball", + /*name_plural*/ "metaballs", + /*translation_context*/ BLT_I18NCONTEXT_ID_METABALL, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ metaball_init_data, - /* copy_data */ metaball_copy_data, - /* free_data */ metaball_free_data, - /* make_local */ nullptr, - /* foreach_id */ metaball_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ metaball_init_data, + /*copy_data*/ metaball_copy_data, + /*free_data*/ metaball_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ metaball_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ metaball_blend_write, - /* blend_read_data */ metaball_blend_read_data, - /* blend_read_lib */ metaball_blend_read_lib, - /* blend_read_expand */ metaball_blend_read_expand, + /*blend_write*/ metaball_blend_write, + /*blend_read_data*/ metaball_blend_read_data, + /*blend_read_lib*/ metaball_blend_read_lib, + /*blend_read_expand*/ metaball_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; /* Functions */ diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 23276b524b4..8ee01107c84 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -408,33 +408,33 @@ static void mesh_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_ME = { - /* id_code */ ID_ME, - /* id_filter */ FILTER_ID_ME, - /* main_listbase_index */ INDEX_ID_ME, - /* struct_size */ sizeof(Mesh), - /* name */ "Mesh", - /* name_plural */ "meshes", - /* translation_context */ BLT_I18NCONTEXT_ID_MESH, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_ME, + /*id_filter*/ FILTER_ID_ME, + /*main_listbase_index*/ INDEX_ID_ME, + /*struct_size*/ sizeof(Mesh), + /*name*/ "Mesh", + /*name_plural*/ "meshes", + /*translation_context*/ BLT_I18NCONTEXT_ID_MESH, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ mesh_init_data, - /* copy_data */ mesh_copy_data, - /* free_data */ mesh_free_data, - /* make_local */ nullptr, - /* foreach_id */ mesh_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ mesh_foreach_path, - /* owner_pointer_get */ nullptr, + /*init_data*/ mesh_init_data, + /*copy_data*/ mesh_copy_data, + /*free_data*/ mesh_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ mesh_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ mesh_foreach_path, + /*owner_pointer_get*/ nullptr, - /* blend_write */ mesh_blend_write, - /* blend_read_data */ mesh_blend_read_data, - /* blend_read_lib */ mesh_blend_read_lib, - /* blend_read_expand */ mesh_read_expand, + /*blend_write*/ mesh_blend_write, + /*blend_read_data*/ mesh_blend_read_data, + /*blend_read_lib*/ mesh_blend_read_lib, + /*blend_read_expand*/ mesh_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; enum { diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index e42a974eba2..9c2ac298fd2 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -1040,37 +1040,37 @@ static void node_tree_asset_pre_save(void *asset_ptr, AssetMetaData *asset_data) } // namespace blender::bke static AssetTypeInfo AssetType_NT = { - /* pre_save_fn */ blender::bke::node_tree_asset_pre_save, + /*pre_save_fn*/ blender::bke::node_tree_asset_pre_save, }; IDTypeInfo IDType_ID_NT = { - /* id_code */ ID_NT, - /* id_filter */ FILTER_ID_NT, - /* main_listbase_index */ INDEX_ID_NT, - /* struct_size */ sizeof(bNodeTree), - /* name */ "NodeTree", - /* name_plural */ "node_groups", - /* translation_context */ BLT_I18NCONTEXT_ID_NODETREE, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ &AssetType_NT, + /*id_code*/ ID_NT, + /*id_filter*/ FILTER_ID_NT, + /*main_listbase_index*/ INDEX_ID_NT, + /*struct_size*/ sizeof(bNodeTree), + /*name*/ "NodeTree", + /*name_plural*/ "node_groups", + /*translation_context*/ BLT_I18NCONTEXT_ID_NODETREE, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ &AssetType_NT, - /* init_data */ ntree_init_data, - /* copy_data */ ntree_copy_data, - /* free_data */ ntree_free_data, - /* make_local */ nullptr, - /* foreach_id */ node_foreach_id, - /* foreach_cache */ node_foreach_cache, - /* foreach_path */ node_foreach_path, - /* owner_pointer_get */ node_owner_pointer_get, + /*init_data*/ ntree_init_data, + /*copy_data*/ ntree_copy_data, + /*free_data*/ ntree_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ node_foreach_id, + /*foreach_cache*/ node_foreach_cache, + /*foreach_path*/ node_foreach_path, + /*owner_pointer_get*/ node_owner_pointer_get, - /* blend_write */ ntree_blend_write, - /* blend_read_data */ ntree_blend_read_data, - /* blend_read_lib */ ntree_blend_read_lib, - /* blend_read_expand */ ntree_blend_read_expand, + /*blend_write*/ ntree_blend_write, + /*blend_read_data*/ ntree_blend_read_data, + /*blend_read_lib*/ ntree_blend_read_lib, + /*blend_read_expand*/ ntree_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; static void node_add_sockets_from_type(bNodeTree *ntree, bNode *node, bNodeType *ntype) diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 16aeff19ee9..dfc2451d7fe 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -1221,37 +1221,37 @@ static void object_asset_pre_save(void *asset_ptr, struct AssetMetaData *asset_d } static AssetTypeInfo AssetType_OB = { - /* pre_save_fn */ object_asset_pre_save, + /*pre_save_fn*/ object_asset_pre_save, }; IDTypeInfo IDType_ID_OB = { - /* id_code */ ID_OB, - /* id_filter */ FILTER_ID_OB, - /* main_listbase_index */ INDEX_ID_OB, - /* struct_size */ sizeof(Object), - /* name */ "Object", - /* name_plural */ "objects", - /* translation_context */ BLT_I18NCONTEXT_ID_OBJECT, - /* flags */ 0, - /* asset_type_info */ &AssetType_OB, + /*id_code*/ ID_OB, + /*id_filter*/ FILTER_ID_OB, + /*main_listbase_index*/ INDEX_ID_OB, + /*struct_size*/ sizeof(Object), + /*name*/ "Object", + /*name_plural*/ "objects", + /*translation_context*/ BLT_I18NCONTEXT_ID_OBJECT, + /*flags*/ 0, + /*asset_type_info*/ &AssetType_OB, - /* init_data */ object_init_data, - /* copy_data */ object_copy_data, - /* free_data */ object_free_data, - /* make_local */ nullptr, - /* foreach_id */ object_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ object_foreach_path, - /* owner_pointer_get */ nullptr, + /*init_data*/ object_init_data, + /*copy_data*/ object_copy_data, + /*free_data*/ object_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ object_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ object_foreach_path, + /*owner_pointer_get*/ nullptr, - /* blend_write */ object_blend_write, - /* blend_read_data */ object_blend_read_data, - /* blend_read_lib */ object_blend_read_lib, - /* blend_read_expand */ object_blend_read_expand, + /*blend_write*/ object_blend_write, + /*blend_read_data*/ object_blend_read_data, + /*blend_read_lib*/ object_blend_read_lib, + /*blend_read_expand*/ object_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ object_lib_override_apply_post, + /*lib_override_apply_post*/ object_lib_override_apply_post, }; void BKE_object_workob_clear(Object *workob) diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index e5d15918a2b..9fdef8525d4 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -529,9 +529,8 @@ static void make_duplis_collection(const DupliContext *ctx) } static const DupliGenerator gen_dupli_collection = { - OB_DUPLICOLLECTION, /* type */ - make_duplis_collection /* make_duplis */ -}; + /*type*/ OB_DUPLICOLLECTION, + /*make_duplis*/ make_duplis_collection}; /** \} */ @@ -744,9 +743,8 @@ static void make_duplis_verts(const DupliContext *ctx) } static const DupliGenerator gen_dupli_verts = { - OB_DUPLIVERTS, /* type */ - make_duplis_verts /* make_duplis */ -}; + /*type*/ OB_DUPLIVERTS, + /*make_duplis*/ make_duplis_verts}; /** \} */ @@ -873,9 +871,8 @@ static void make_duplis_font(const DupliContext *ctx) } static const DupliGenerator gen_dupli_verts_font = { - OB_DUPLIVERTS, /* type */ - make_duplis_font /* make_duplis */ -}; + /*type*/ OB_DUPLIVERTS, + /*make_duplis*/ make_duplis_font}; /** \} */ @@ -1034,8 +1031,8 @@ static void make_duplis_geometry_set(const DupliContext *ctx) } static const DupliGenerator gen_dupli_geometry_set = { - GEOMETRY_SET_DUPLI_GENERATOR_TYPE, - make_duplis_geometry_set, + /*type*/ GEOMETRY_SET_DUPLI_GENERATOR_TYPE, + /*make_duplis*/ make_duplis_geometry_set, }; /** \} */ @@ -1335,9 +1332,8 @@ static void make_duplis_faces(const DupliContext *ctx) } static const DupliGenerator gen_dupli_faces = { - OB_DUPLIFACES, /* type */ - make_duplis_faces /* make_duplis */ -}; + /*type*/ OB_DUPLIFACES, + /*make_duplis*/ make_duplis_faces}; /** \} */ @@ -1685,9 +1681,8 @@ static void make_duplis_particles(const DupliContext *ctx) } static const DupliGenerator gen_dupli_particles = { - OB_DUPLIPARTS, /* type */ - make_duplis_particles /* make_duplis */ -}; + /*type*/ OB_DUPLIPARTS, + /*make_duplis*/ make_duplis_particles}; /** \} */ diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 6628bc782f0..090a3ce0d7e 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -133,33 +133,33 @@ static void palette_undo_preserve(BlendLibReader * /*reader*/, ID *id_new, ID *i } IDTypeInfo IDType_ID_PAL = { - /* id_code */ ID_PAL, - /* id_filter */ FILTER_ID_PAL, - /* main_listbase_index */ INDEX_ID_PAL, - /* struct_size */ sizeof(Palette), - /* name */ "Palette", - /* name_plural */ "palettes", - /* translation_context */ BLT_I18NCONTEXT_ID_PALETTE, - /* flags */ IDTYPE_FLAGS_NO_ANIMDATA, - /* asset_type_info */ nullptr, + /*id_code*/ ID_PAL, + /*id_filter*/ FILTER_ID_PAL, + /*main_listbase_index*/ INDEX_ID_PAL, + /*struct_size*/ sizeof(Palette), + /*name*/ "Palette", + /*name_plural*/ "palettes", + /*translation_context*/ BLT_I18NCONTEXT_ID_PALETTE, + /*flags*/ IDTYPE_FLAGS_NO_ANIMDATA, + /*asset_type_info*/ nullptr, - /* init_data */ palette_init_data, - /* copy_data */ palette_copy_data, - /* free_data */ palette_free_data, - /* make_local */ nullptr, - /* foreach_id */ nullptr, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ palette_init_data, + /*copy_data*/ palette_copy_data, + /*free_data*/ palette_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ nullptr, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ palette_blend_write, - /* blend_read_data */ palette_blend_read_data, - /* blend_read_lib */ nullptr, - /* blend_read_expand */ nullptr, + /*blend_write*/ palette_blend_write, + /*blend_read_data*/ palette_blend_read_data, + /*blend_read_lib*/ nullptr, + /*blend_read_expand*/ nullptr, - /* blend_read_undo_preserve */ palette_undo_preserve, + /*blend_read_undo_preserve*/ palette_undo_preserve, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; static void paint_curve_copy_data(Main * /*bmain*/, @@ -201,33 +201,33 @@ static void paint_curve_blend_read_data(BlendDataReader *reader, ID *id) } IDTypeInfo IDType_ID_PC = { - /* id_code */ ID_PC, - /* id_filter */ FILTER_ID_PC, - /* main_listbase_index */ INDEX_ID_PC, - /* struct_size */ sizeof(PaintCurve), - /* name */ "PaintCurve", - /* name_plural */ "paint_curves", - /* translation_context */ BLT_I18NCONTEXT_ID_PAINTCURVE, - /* flags */ IDTYPE_FLAGS_NO_ANIMDATA, - /* asset_type_info */ nullptr, + /*id_code*/ ID_PC, + /*id_filter*/ FILTER_ID_PC, + /*main_listbase_index*/ INDEX_ID_PC, + /*struct_size*/ sizeof(PaintCurve), + /*name*/ "PaintCurve", + /*name_plural*/ "paint_curves", + /*translation_context*/ BLT_I18NCONTEXT_ID_PAINTCURVE, + /*flags*/ IDTYPE_FLAGS_NO_ANIMDATA, + /*asset_type_info*/ nullptr, - /* init_data */ nullptr, - /* copy_data */ paint_curve_copy_data, - /* free_data */ paint_curve_free_data, - /* make_local */ nullptr, - /* foreach_id */ nullptr, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ nullptr, + /*copy_data*/ paint_curve_copy_data, + /*free_data*/ paint_curve_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ nullptr, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ paint_curve_blend_write, - /* blend_read_data */ paint_curve_blend_read_data, - /* blend_read_lib */ nullptr, - /* blend_read_expand */ nullptr, + /*blend_write*/ paint_curve_blend_write, + /*blend_read_data*/ paint_curve_blend_read_data, + /*blend_read_lib*/ nullptr, + /*blend_read_expand*/ nullptr, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; const uchar PAINT_CURSOR_SCULPT[3] = {255, 100, 100}; diff --git a/source/blender/blenkernel/intern/pointcloud.cc b/source/blender/blenkernel/intern/pointcloud.cc index 8207bb2cd05..aa3c2593f34 100644 --- a/source/blender/blenkernel/intern/pointcloud.cc +++ b/source/blender/blenkernel/intern/pointcloud.cc @@ -166,33 +166,33 @@ static void pointcloud_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_PT = { - /* id_code */ ID_PT, - /* id_filter */ FILTER_ID_PT, - /* main_listbase_index */ INDEX_ID_PT, - /* struct_size */ sizeof(PointCloud), - /* name */ "PointCloud", - /* name_plural */ "pointclouds", - /* translation_context */ BLT_I18NCONTEXT_ID_POINTCLOUD, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_PT, + /*id_filter*/ FILTER_ID_PT, + /*main_listbase_index*/ INDEX_ID_PT, + /*struct_size*/ sizeof(PointCloud), + /*name*/ "PointCloud", + /*name_plural*/ "pointclouds", + /*translation_context*/ BLT_I18NCONTEXT_ID_POINTCLOUD, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ pointcloud_init_data, - /* copy_data */ pointcloud_copy_data, - /* free_data */ pointcloud_free_data, - /* make_local */ nullptr, - /* foreach_id */ pointcloud_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ pointcloud_init_data, + /*copy_data*/ pointcloud_copy_data, + /*free_data*/ pointcloud_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ pointcloud_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ pointcloud_blend_write, - /* blend_read_data */ pointcloud_blend_read_data, - /* blend_read_lib */ pointcloud_blend_read_lib, - /* blend_read_expand */ pointcloud_blend_read_expand, + /*blend_write*/ pointcloud_blend_write, + /*blend_read_data*/ pointcloud_blend_read_data, + /*blend_read_lib*/ pointcloud_blend_read_lib, + /*blend_read_expand*/ pointcloud_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; static void pointcloud_random(PointCloud *pointcloud) diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc index 14719c83ee9..c0e67b910f0 100644 --- a/source/blender/blenkernel/intern/simulation.cc +++ b/source/blender/blenkernel/intern/simulation.cc @@ -132,33 +132,33 @@ static void simulation_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_SIM = { - /* id_code */ ID_SIM, - /* id_filter */ FILTER_ID_SIM, - /* main_listbase_index */ INDEX_ID_SIM, - /* struct_size */ sizeof(Simulation), - /* name */ "Simulation", - /* name_plural */ "simulations", - /* translation_context */ BLT_I18NCONTEXT_ID_SIMULATION, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_SIM, + /*id_filter*/ FILTER_ID_SIM, + /*main_listbase_index*/ INDEX_ID_SIM, + /*struct_size*/ sizeof(Simulation), + /*name*/ "Simulation", + /*name_plural*/ "simulations", + /*translation_context*/ BLT_I18NCONTEXT_ID_SIMULATION, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ simulation_init_data, - /* copy_data */ simulation_copy_data, - /* free_data */ simulation_free_data, - /* make_local */ nullptr, - /* foreach_id */ simulation_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ simulation_init_data, + /*copy_data*/ simulation_copy_data, + /*free_data*/ simulation_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ simulation_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ simulation_blend_write, - /* blend_read_data */ simulation_blend_read_data, - /* blend_read_lib */ simulation_blend_read_lib, - /* blend_read_expand */ simulation_blend_read_expand, + /*blend_write*/ simulation_blend_write, + /*blend_read_data*/ simulation_blend_read_data, + /*blend_read_lib*/ simulation_blend_read_lib, + /*blend_read_expand*/ simulation_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; void *BKE_simulation_add(Main *bmain, const char *name) diff --git a/source/blender/blenkernel/intern/texture.cc b/source/blender/blenkernel/intern/texture.cc index d2cecb372a0..ed385fae454 100644 --- a/source/blender/blenkernel/intern/texture.cc +++ b/source/blender/blenkernel/intern/texture.cc @@ -191,33 +191,33 @@ static void texture_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_TE = { - /* id_code */ ID_TE, - /* id_filter */ FILTER_ID_TE, - /* main_listbase_index */ INDEX_ID_TE, - /* struct_size */ sizeof(Tex), - /* name */ "Texture", - /* name_plural */ "textures", - /* translation_context */ BLT_I18NCONTEXT_ID_TEXTURE, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_TE, + /*id_filter*/ FILTER_ID_TE, + /*main_listbase_index*/ INDEX_ID_TE, + /*struct_size*/ sizeof(Tex), + /*name*/ "Texture", + /*name_plural*/ "textures", + /*translation_context*/ BLT_I18NCONTEXT_ID_TEXTURE, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ texture_init_data, - /* copy_data */ texture_copy_data, - /* free_data */ texture_free_data, - /* make_local */ nullptr, - /* foreach_id */ texture_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ texture_init_data, + /*copy_data*/ texture_copy_data, + /*free_data*/ texture_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ texture_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ texture_blend_write, - /* blend_read_data */ texture_blend_read_data, - /* blend_read_lib */ texture_blend_read_lib, - /* blend_read_expand */ texture_blend_read_expand, + /*blend_write*/ texture_blend_write, + /*blend_read_data*/ texture_blend_read_data, + /*blend_read_lib*/ texture_blend_read_lib, + /*blend_read_expand*/ texture_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; void BKE_texture_mtex_foreach_id(LibraryForeachIDData *data, MTex *mtex) diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 04501e3fe4a..050ba18db9a 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -564,8 +564,8 @@ static void volume_foreach_cache(ID *id, { Volume *volume = (Volume *)id; IDCacheKey key = { - /* id_session_uuid */ id->session_uuid, - /* offset_in_ID */ offsetof(Volume, runtime.grids), + /*id_session_uuid*/ id->session_uuid, + /*offset_in_ID*/ offsetof(Volume, runtime.grids), }; function_callback(id, &key, (void **)&volume->runtime.grids, 0, user_data); @@ -644,33 +644,33 @@ static void volume_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_VO = { - /* id_code */ ID_VO, - /* id_filter */ FILTER_ID_VO, - /* main_listbase_index */ INDEX_ID_VO, - /* struct_size */ sizeof(Volume), - /* name */ "Volume", - /* name_plural */ "volumes", - /* translation_context */ BLT_I18NCONTEXT_ID_VOLUME, - /* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE, - /* asset_type_info */ nullptr, + /*id_code*/ ID_VO, + /*id_filter*/ FILTER_ID_VO, + /*main_listbase_index*/ INDEX_ID_VO, + /*struct_size*/ sizeof(Volume), + /*name*/ "Volume", + /*name_plural*/ "volumes", + /*translation_context*/ BLT_I18NCONTEXT_ID_VOLUME, + /*flags*/ IDTYPE_FLAGS_APPEND_IS_REUSABLE, + /*asset_type_info*/ nullptr, - /* init_data */ volume_init_data, - /* copy_data */ volume_copy_data, - /* free_data */ volume_free_data, - /* make_local */ nullptr, - /* foreach_id */ volume_foreach_id, - /* foreach_cache */ volume_foreach_cache, - /* foreach_path */ volume_foreach_path, - /* owner_pointer_get */ nullptr, + /*init_data*/ volume_init_data, + /*copy_data*/ volume_copy_data, + /*free_data*/ volume_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ volume_foreach_id, + /*foreach_cache*/ volume_foreach_cache, + /*foreach_path*/ volume_foreach_path, + /*owner_pointer_get*/ nullptr, - /* blend_write */ volume_blend_write, - /* blend_read_data */ volume_blend_read_data, - /* blend_read_lib */ volume_blend_read_lib, - /* blend_read_expand */ volume_blend_read_expand, + /*blend_write*/ volume_blend_write, + /*blend_read_data*/ volume_blend_read_data, + /*blend_read_lib*/ volume_blend_read_lib, + /*blend_read_expand*/ volume_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; void BKE_volume_init_grids(Volume *volume) diff --git a/source/blender/blenkernel/intern/workspace.cc b/source/blender/blenkernel/intern/workspace.cc index 6ffef5555fb..4b617a15e7e 100644 --- a/source/blender/blenkernel/intern/workspace.cc +++ b/source/blender/blenkernel/intern/workspace.cc @@ -186,33 +186,33 @@ static void workspace_blend_read_expand(BlendExpander *expander, ID *id) } IDTypeInfo IDType_ID_WS = { - /* id_code */ ID_WS, - /* id_filter */ FILTER_ID_WS, - /* main_listbase_index */ INDEX_ID_WS, - /* struct_size */ sizeof(WorkSpace), - /* name */ "WorkSpace", - /* name_plural */ "workspaces", - /* translation_context */ BLT_I18NCONTEXT_ID_WORKSPACE, - /* flags */ IDTYPE_FLAGS_NO_COPY | IDTYPE_FLAGS_ONLY_APPEND | IDTYPE_FLAGS_NO_ANIMDATA, - /* asset_type_info */ nullptr, + /*id_code*/ ID_WS, + /*id_filter*/ FILTER_ID_WS, + /*main_listbase_index*/ INDEX_ID_WS, + /*struct_size*/ sizeof(WorkSpace), + /*name*/ "WorkSpace", + /*name_plural*/ "workspaces", + /*translation_context*/ BLT_I18NCONTEXT_ID_WORKSPACE, + /*flags*/ IDTYPE_FLAGS_NO_COPY | IDTYPE_FLAGS_ONLY_APPEND | IDTYPE_FLAGS_NO_ANIMDATA, + /*asset_type_info*/ nullptr, - /* init_data */ workspace_init_data, - /* copy_data */ nullptr, - /* free_data */ workspace_free_data, - /* make_local */ nullptr, - /* foreach_id */ workspace_foreach_id, - /* foreach_cache */ nullptr, - /* foreach_path */ nullptr, - /* owner_pointer_get */ nullptr, + /*init_data*/ workspace_init_data, + /*copy_data*/ nullptr, + /*free_data*/ workspace_free_data, + /*make_local*/ nullptr, + /*foreach_id*/ workspace_foreach_id, + /*foreach_cache*/ nullptr, + /*foreach_path*/ nullptr, + /*owner_pointer_get*/ nullptr, - /* blend_write */ workspace_blend_write, - /* blend_read_data */ workspace_blend_read_data, - /* blend_read_lib */ workspace_blend_read_lib, - /* blend_read_expand */ workspace_blend_read_expand, + /*blend_write*/ workspace_blend_write, + /*blend_read_data*/ workspace_blend_read_data, + /*blend_read_lib*/ workspace_blend_read_lib, + /*blend_read_expand*/ workspace_blend_read_expand, - /* blend_read_undo_preserve */ nullptr, + /*blend_read_undo_preserve*/ nullptr, - /* lib_override_apply_post */ nullptr, + /*lib_override_apply_post*/ nullptr, }; /* -------------------------------------------------------------------- */ diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index 44857cd87e1..80dc12535a5 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -255,7 +255,7 @@ DrawEngineType draw_engine_basic_type = { &basic_data_size, NULL, &basic_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, &basic_cache_init, &basic_cache_populate, &basic_cache_finish, diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc index 54a64a7dd00..6c2b0e2f3ff 100644 --- a/source/blender/draw/engines/compositor/compositor_engine.cc +++ b/source/blender/draw/engines/compositor/compositor_engine.cc @@ -249,20 +249,20 @@ extern "C" { static const DrawEngineDataSize compositor_data_size = DRW_VIEWPORT_DATA_SIZE(COMPOSITOR_Data); DrawEngineType draw_engine_compositor_type = { - nullptr, /* next */ - nullptr, /* prev */ - N_("Compositor"), /* idname */ - &compositor_data_size, /* vedata_size */ - &compositor_engine_init, /* engine_init */ - nullptr, /* engine_free */ - &compositor_engine_free, /* instance_free */ - nullptr, /* cache_init */ - nullptr, /* cache_populate */ - nullptr, /* cache_finish */ - &compositor_engine_draw, /* draw_scene */ - &compositor_engine_update, /* view_update */ - nullptr, /* id_update */ - nullptr, /* render_to_image */ - nullptr, /* store_metadata */ + /*next*/ nullptr, + /*prev*/ nullptr, + /*idname*/ N_("Compositor"), + /*vedata_size*/ &compositor_data_size, + /*engine_init*/ &compositor_engine_init, + /*engine_free*/ nullptr, + /*instance_free*/ &compositor_engine_free, + /*cache_init*/ nullptr, + /*cache_populate*/ nullptr, + /*cache_finish*/ nullptr, + /*draw_scene*/ &compositor_engine_draw, + /*view_update*/ &compositor_engine_update, + /*id_update*/ nullptr, + /*render_to_image*/ nullptr, + /*store_metadata*/ nullptr, }; } diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index ff17c02b3ee..0bdee957af2 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -622,7 +622,7 @@ DrawEngineType draw_engine_eevee_type = { &eevee_data_size, &eevee_engine_init, &eevee_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, &eevee_cache_init, &EEVEE_cache_populate, &eevee_cache_finish, diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c index 3f047d8de68..20b515414b8 100644 --- a/source/blender/draw/engines/external/external_engine.c +++ b/source/blender/draw/engines/external/external_engine.c @@ -440,7 +440,7 @@ DrawEngineType draw_engine_external_type = { &external_data_size, &external_engine_init, &external_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, &external_cache_init, &external_cache_populate, &external_cache_finish, diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 6a4312e572a..16437300dba 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -978,7 +978,7 @@ DrawEngineType draw_engine_gpencil_type = { &GPENCIL_data_size, &GPENCIL_engine_init, &GPENCIL_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, &GPENCIL_cache_init, &GPENCIL_cache_populate, &GPENCIL_cache_finish, diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index e266135ec18..e055dc5836c 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -185,20 +185,20 @@ extern "C" { using namespace blender::draw::image_engine; DrawEngineType draw_engine_image_type = { - nullptr, /* next */ - nullptr, /* prev */ - N_("UV/Image"), /* idname */ - &IMAGE_data_size, /* vedata_size */ - &IMAGE_engine_init, /* engine_init */ - &IMAGE_engine_free, /* engine_free */ - &IMAGE_instance_free, /* instance_free */ - &IMAGE_cache_init, /* cache_init */ - &IMAGE_cache_populate, /* cache_populate */ - nullptr, /* cache_finish */ - &IMAGE_draw_scene, /* draw_scene */ - nullptr, /* view_update */ - nullptr, /* id_update */ - nullptr, /* render_to_image */ - nullptr, /* store_metadata */ + /*next*/ nullptr, + /*prev*/ nullptr, + /*idname*/ N_("UV/Image"), + /*vedata_size*/ &IMAGE_data_size, + /*engine_init*/ &IMAGE_engine_init, + /*engine_free*/ &IMAGE_engine_free, + /*instance_free*/ &IMAGE_instance_free, + /*cache_init*/ &IMAGE_cache_init, + /*cache_populate*/ &IMAGE_cache_populate, + /*cache_finish*/ nullptr, + /*draw_scene*/ &IMAGE_draw_scene, + /*view_update*/ nullptr, + /*id_update*/ nullptr, + /*render_to_image*/ nullptr, + /*store_metadata*/ nullptr, }; } diff --git a/source/blender/draw/engines/select/select_debug_engine.c b/source/blender/draw/engines/select/select_debug_engine.c index c46f6137149..e221e4771b5 100644 --- a/source/blender/draw/engines/select/select_debug_engine.c +++ b/source/blender/draw/engines/select/select_debug_engine.c @@ -105,7 +105,7 @@ DrawEngineType draw_engine_debug_select_type = { &select_debug_data_size, &select_debug_engine_init, &select_debug_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, NULL, NULL, NULL, diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c index 2598cc01916..dc8dfbe79fb 100644 --- a/source/blender/draw/engines/select/select_engine.c +++ b/source/blender/draw/engines/select/select_engine.c @@ -330,7 +330,7 @@ DrawEngineType draw_engine_select_type = { &select_data_size, &select_engine_init, &select_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, &select_cache_init, &select_cache_populate, NULL, diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 830a9213f5a..9681e8f6cf5 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -672,7 +672,7 @@ DrawEngineType draw_engine_workbench = { &workbench_data_size, &workbench_engine_init, &workbench_engine_free, - NULL, /* instance_free */ + /*instance_free*/ NULL, &workbench_cache_init, &workbench_cache_populate, &workbench_cache_finish, diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 9953da4847d..60d34b99b3d 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2015,7 +2015,7 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) size[0], size[1], view_layer->name, - /* RR_ALL_VIEWS */ NULL); + /*RR_ALL_VIEWS*/ NULL); RenderLayer *render_layer = render_result->layers.first; for (RenderView *render_view = render_result->views.first; render_view != NULL; render_view = render_view->next) { diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 3a82143cfdf..7d95a3f949a 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -530,21 +530,21 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, /** All animation summary (dope-sheet only) type define. */ static bAnimChannelType ACF_SUMMARY = { - "Summary", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Summary", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_summary_color, /* backdrop color */ - acf_summary_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - NULL, /* offset */ + /*get_backdrop_color*/ acf_summary_color, + /*draw_backdrop*/ acf_summary_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ NULL, - acf_summary_name, /* name */ - NULL, /* name prop */ - NULL, /* icon */ + /*name*/ acf_summary_name, + /*name_prop*/ NULL, + /*icon*/ NULL, - acf_summary_setting_valid, /* has setting */ - acf_summary_setting_flag, /* flag for setting */ - acf_summary_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_summary_setting_valid, + /*setting_flag*/ acf_summary_setting_flag, + /*setting_ptr*/ acf_summary_setting_ptr, }; /* Scene ------------------------------------------- */ @@ -639,21 +639,21 @@ static void *acf_scene_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Scene type define. */ static bAnimChannelType ACF_SCENE = { - "Scene", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Scene", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_root_color, /* backdrop color */ - acf_generic_root_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - NULL, /* offset */ + /*get_backdrop_color*/ acf_generic_root_color, + /*draw_backdrop*/ acf_generic_root_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ NULL, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_scene_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_scene_icon, - acf_scene_setting_valid, /* has setting */ - acf_scene_setting_flag, /* flag for setting */ - acf_scene_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_scene_setting_valid, + /*setting_flag*/ acf_scene_setting_flag, + /*setting_ptr*/ acf_scene_setting_ptr, }; /* Object ------------------------------------------- */ @@ -815,21 +815,21 @@ static void *acf_object_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se /** Object type define. */ static bAnimChannelType ACF_OBJECT = { - "Object", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Object", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_root_color, /* backdrop color */ - acf_generic_root_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - NULL, /* offset */ + /*get_backdrop_color*/ acf_generic_root_color, + /*draw_backdrop*/ acf_generic_root_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ NULL, - acf_object_name, /* name */ - acf_object_name_prop, /* name prop */ - acf_object_icon, /* icon */ + /*name*/ acf_object_name, + /*name_prop*/ acf_object_name_prop, + /*icon*/ acf_object_icon, - acf_object_setting_valid, /* has setting */ - acf_object_setting_flag, /* flag for setting */ - acf_object_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_object_setting_valid, + /*setting_flag*/ acf_object_setting_flag, + /*setting_ptr*/ acf_object_setting_ptr, }; /* Group ------------------------------------------- */ @@ -992,21 +992,21 @@ static void *acf_group_setting_ptr(bAnimListElem *ale, /** Group type define. */ static bAnimChannelType ACF_GROUP = { - "Group", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "Group", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_group_color, /* backdrop color */ - acf_group_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_group_color, + /*draw_backdrop*/ acf_group_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ acf_generic_group_offset, - acf_group_name, /* name */ - acf_group_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_group_name, + /*name_prop*/ acf_group_name_prop, + /*icon*/ NULL, - acf_group_setting_valid, /* has setting */ - acf_group_setting_flag, /* flag for setting */ - acf_group_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_group_setting_valid, + /*setting_flag*/ acf_group_setting_flag, + /*setting_ptr*/ acf_group_setting_ptr, }; /* F-Curve ------------------------------------------- */ @@ -1116,22 +1116,22 @@ static void *acf_fcurve_setting_ptr(bAnimListElem *ale, /** F-Curve type define. */ static bAnimChannelType ACF_FCURVE = { - "F-Curve", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "F-Curve", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indentation_flexible, - /* indent level */ /* XXX rename this to f-curves only? */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_channel_color, + /*draw_backdrop*/ acf_generic_channel_backdrop, + /*get_indent_level*/ acf_generic_indentation_flexible, + /* XXX rename this to f-curves only? */ + /*get_offset*/ acf_generic_group_offset, - acf_fcurve_name, /* name */ - acf_fcurve_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_fcurve_name, + /*name_prop*/ acf_fcurve_name_prop, + /*icon*/ NULL, - acf_fcurve_setting_valid, /* has setting */ - acf_fcurve_setting_flag, /* flag for setting */ - acf_fcurve_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_fcurve_setting_valid, + /*setting_flag*/ acf_fcurve_setting_flag, + /*setting_ptr*/ acf_fcurve_setting_ptr, }; /* NLA Control FCurves Expander ----------------------- */ @@ -1236,21 +1236,21 @@ static int acf_nla_controls_icon(bAnimListElem *UNUSED(ale)) /** NLA Control F-Curves expander type define. */ static bAnimChannelType ACF_NLACONTROLS = { - "NLA Controls Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "NLA Controls Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_nla_controls_color, /* backdrop color */ - acf_nla_controls_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_nla_controls_color, + /*draw_backdrop*/ acf_nla_controls_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ acf_generic_group_offset, - acf_nla_controls_name, /* name */ - NULL, /* name prop */ - acf_nla_controls_icon, /* icon */ + /*name*/ acf_nla_controls_name, + /*name_prop*/ NULL, + /*icon*/ acf_nla_controls_icon, - acf_nla_controls_setting_valid, /* has setting */ - acf_nla_controls_setting_flag, /* flag for setting */ - acf_nla_controls_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_nla_controls_setting_valid, + /*setting_flag*/ acf_nla_controls_setting_flag, + /*setting_ptr*/ acf_nla_controls_setting_ptr, }; /* NLA Control F-Curve -------------------------------- */ @@ -1276,21 +1276,21 @@ static void acf_nla_curve_name(bAnimListElem *ale, char *name) /** NLA Control F-Curve type define. */ static bAnimChannelType ACF_NLACURVE = { - "NLA Control F-Curve", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "NLA Control F-Curve", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_channel_color, + /*draw_backdrop*/ acf_generic_channel_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_group_offset, - acf_nla_curve_name, /* name */ - acf_fcurve_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_nla_curve_name, + /*name_prop*/ acf_fcurve_name_prop, + /*icon*/ NULL, - acf_fcurve_setting_valid, /* has setting */ - acf_fcurve_setting_flag, /* flag for setting */ - acf_fcurve_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_fcurve_setting_valid, + /*setting_flag*/ acf_fcurve_setting_flag, + /*setting_ptr*/ acf_fcurve_setting_ptr, }; /* Object Action Expander ------------------------------------------- */ @@ -1366,21 +1366,21 @@ static void *acf_fillactd_setting_ptr(bAnimListElem *ale, /** Object action expander type define. */ static bAnimChannelType ACF_FILLACTD = { - "Ob-Action Filler", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Ob-Action Filler", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_fillactd_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_fillactd_icon, - acf_fillactd_setting_valid, /* has setting */ - acf_fillactd_setting_flag, /* flag for setting */ - acf_fillactd_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_fillactd_setting_valid, + /*setting_flag*/ acf_fillactd_setting_flag, + /*setting_ptr*/ acf_fillactd_setting_ptr, }; /* Drivers Expander ------------------------------------------- */ @@ -1451,21 +1451,21 @@ static void *acf_filldrivers_setting_ptr(bAnimListElem *ale, /** Drivers expander type define. */ static bAnimChannelType ACF_FILLDRIVERS = { - "Drivers Filler", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Drivers Filler", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_filldrivers_name, /* name */ - NULL, /* name prop */ - acf_filldrivers_icon, /* icon */ + /*name*/ acf_filldrivers_name, + /*name_prop*/ NULL, + /*icon*/ acf_filldrivers_icon, - acf_filldrivers_setting_valid, /* has setting */ - acf_filldrivers_setting_flag, /* flag for setting */ - acf_filldrivers_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_filldrivers_setting_valid, + /*setting_flag*/ acf_filldrivers_setting_flag, + /*setting_ptr*/ acf_filldrivers_setting_ptr, }; /* Material Expander ------------------------------------------- */ @@ -1530,21 +1530,21 @@ static void *acf_dsmat_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Material expander type define. */ static bAnimChannelType ACF_DSMAT = { - "Material Data Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Material Data Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsmat_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsmat_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmat_setting_flag, /* flag for setting */ - acf_dsmat_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsmat_setting_flag, + /*setting_ptr*/ acf_dsmat_setting_ptr, }; /* Light Expander ------------------------------------------- */ @@ -1611,21 +1611,21 @@ static void *acf_dslight_setting_ptr(bAnimListElem *ale, /** Light expander type define. */ static bAnimChannelType ACF_DSLIGHT = { - "Light Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Light Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dslight_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dslight_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dslight_setting_flag, /* flag for setting */ - acf_dslight_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dslight_setting_flag, + /*setting_ptr*/ acf_dslight_setting_ptr, }; /* Texture Expander ------------------------------------------- */ @@ -1697,21 +1697,21 @@ static void *acf_dstex_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Texture expander type define. */ static bAnimChannelType ACF_DSTEX = { - "Texture Data Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Texture Data Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_dstex_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_dstex_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_dstex_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_dstex_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dstex_setting_flag, /* flag for setting */ - acf_dstex_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dstex_setting_flag, + /*setting_ptr*/ acf_dstex_setting_ptr, }; /* Camera Expander ------------------------------------------- */ @@ -1780,21 +1780,21 @@ static void *acf_dscachefile_setting_ptr(bAnimListElem *ale, /** CacheFile expander type define.. */ static bAnimChannelType ACF_DSCACHEFILE = { - "Cache File Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Cache File Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_dscachefile_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_dscachefile_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dscachefile_setting_flag, /* flag for setting */ - acf_dscachefile_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dscachefile_setting_flag, + /*setting_ptr*/ acf_dscachefile_setting_ptr, }; /* Camera Expander ------------------------------------------- */ @@ -1863,21 +1863,21 @@ static void *acf_dscam_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Camera expander type define. */ static bAnimChannelType ACF_DSCAM = { - "Camera Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Camera Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_dscam_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_dscam_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dscam_setting_flag, /* flag for setting */ - acf_dscam_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dscam_setting_flag, + /*setting_ptr*/ acf_dscam_setting_ptr, }; /* Curve Expander ------------------------------------------- */ @@ -1952,21 +1952,21 @@ static void *acf_dscur_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Curve expander type define. */ static bAnimChannelType ACF_DSCUR = { - "Curve Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Curve Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dscur_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dscur_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dscur_setting_flag, /* flag for setting */ - acf_dscur_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dscur_setting_flag, + /*setting_ptr*/ acf_dscur_setting_ptr, }; /* Shape Key Expander ------------------------------------------- */ @@ -2050,21 +2050,21 @@ static void *acf_dsskey_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se /** Shape-key expander type define. */ static bAnimChannelType ACF_DSSKEY = { - "Shape Key Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Shape Key Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsskey_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsskey_icon, - acf_dsskey_setting_valid, /* has setting */ - acf_dsskey_setting_flag, /* flag for setting */ - acf_dsskey_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_dsskey_setting_valid, + /*setting_flag*/ acf_dsskey_setting_flag, + /*setting_ptr*/ acf_dsskey_setting_ptr, }; /* World Expander ------------------------------------------- */ @@ -2129,21 +2129,21 @@ static void *acf_dswor_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** World expander type define. */ static bAnimChannelType ACF_DSWOR = { - "World Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "World Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_dswor_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_dswor_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dswor_setting_flag, /* flag for setting */ - acf_dswor_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dswor_setting_flag, + /*setting_ptr*/ acf_dswor_setting_ptr, }; /* Particle Expander ------------------------------------------- */ @@ -2208,21 +2208,21 @@ static void *acf_dspart_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se /** Particle expander type define. */ static bAnimChannelType ACF_DSPART = { - "Particle Data Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Particle Data Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dspart_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dspart_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dspart_setting_flag, /* flag for setting */ - acf_dspart_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dspart_setting_flag, + /*setting_ptr*/ acf_dspart_setting_ptr, }; /* MetaBall Expander ------------------------------------------- */ @@ -2289,21 +2289,21 @@ static void *acf_dsmball_setting_ptr(bAnimListElem *ale, /** Meta-ball expander type define. */ static bAnimChannelType ACF_DSMBALL = { - "Metaball Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Metaball Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsmball_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsmball_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmball_setting_flag, /* flag for setting */ - acf_dsmball_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsmball_setting_flag, + /*setting_ptr*/ acf_dsmball_setting_ptr, }; /* Armature Expander ------------------------------------------- */ @@ -2368,21 +2368,21 @@ static void *acf_dsarm_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Armature expander type define. */ static bAnimChannelType ACF_DSARM = { - "Armature Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Armature Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsarm_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsarm_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsarm_setting_flag, /* flag for setting */ - acf_dsarm_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsarm_setting_flag, + /*setting_ptr*/ acf_dsarm_setting_ptr, }; /* NodeTree Expander ------------------------------------------- */ @@ -2460,21 +2460,21 @@ static void *acf_dsntree_setting_ptr(bAnimListElem *ale, /** Node tree expander type define. */ static bAnimChannelType ACF_DSNTREE = { - "Node Tree Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Node Tree Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_dsntree_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_dsntree_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsntree_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsntree_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsntree_setting_flag, /* flag for setting */ - acf_dsntree_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsntree_setting_flag, + /*setting_ptr*/ acf_dsntree_setting_ptr, }; /* LineStyle Expander ------------------------------------------- */ @@ -2541,21 +2541,21 @@ static void *acf_dslinestyle_setting_ptr(bAnimListElem *ale, /** Line Style expander type define. */ static bAnimChannelType ACF_DSLINESTYLE = { - "Line Style Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Line Style Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dslinestyle_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dslinestyle_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dslinestyle_setting_flag, /* flag for setting */ - acf_dslinestyle_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dslinestyle_setting_flag, + /*setting_ptr*/ acf_dslinestyle_setting_ptr, }; /* Mesh Expander ------------------------------------------- */ @@ -2620,22 +2620,22 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se /** Mesh expander type define. */ static bAnimChannelType ACF_DSMESH = { - "Mesh Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Mesh Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, - /* indent level */ /* XXX this only works for compositing */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /* XXX: this only works for compositing. */ + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsmesh_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsmesh_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmesh_setting_flag, /* flag for setting */ - acf_dsmesh_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsmesh_setting_flag, + /*setting_ptr*/ acf_dsmesh_setting_ptr, }; /* Lattice Expander ------------------------------------------- */ @@ -2700,22 +2700,22 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Lattice expander type define. */ static bAnimChannelType ACF_DSLAT = { - "Lattice Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Lattice Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, - /* indent level */ /* XXX this only works for compositing */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /* XXX: this only works for compositing. */ + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dslat_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dslat_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dslat_setting_flag, /* flag for setting */ - acf_dslat_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dslat_setting_flag, + /*setting_ptr*/ acf_dslat_setting_ptr, }; /* Speaker Expander ------------------------------------------- */ @@ -2780,21 +2780,21 @@ static void *acf_dsspk_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set /** Speaker expander type define. */ static bAnimChannelType ACF_DSSPK = { - "Speaker Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Speaker Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsspk_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsspk_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsspk_setting_flag, /* flag for setting */ - acf_dsspk_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsspk_setting_flag, + /*setting_ptr*/ acf_dsspk_setting_ptr, }; /* Curves Expander ------------------------------------------- */ @@ -2861,22 +2861,21 @@ static void *acf_dscurves_setting_ptr(bAnimListElem *ale, /** Curves expander type define. */ static bAnimChannelType ACF_DSCURVES = { - "Curves Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Curves Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dscurves_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dscurves_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dscurves_setting_flag, /* flag for setting */ - acf_dscurves_setting_ptr /* pointer for setting */ -}; + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dscurves_setting_flag, + /*setting_ptr*/ acf_dscurves_setting_ptr}; /* PointCloud Expander ------------------------------------------- */ @@ -2942,22 +2941,21 @@ static void *acf_dspointcloud_setting_ptr(bAnimListElem *ale, /** Point-cloud expander type define. */ static bAnimChannelType ACF_DSPOINTCLOUD = { - "PointCloud Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "PointCloud Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dspointcloud_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dspointcloud_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dspointcloud_setting_flag, /* flag for setting */ - acf_dspointcloud_setting_ptr /* pointer for setting */ -}; + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dspointcloud_setting_flag, + /*setting_ptr*/ acf_dspointcloud_setting_ptr}; /* Volume Expander ------------------------------------------- */ @@ -3023,22 +3021,21 @@ static void *acf_dsvolume_setting_ptr(bAnimListElem *ale, /** Volume expander type define. */ static bAnimChannelType ACF_DSVOLUME = { - "Volume Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Volume Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsvolume_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsvolume_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsvolume_setting_flag, /* flag for setting */ - acf_dsvolume_setting_ptr /* pointer for setting */ -}; + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsvolume_setting_flag, + /*setting_ptr*/ acf_dsvolume_setting_ptr}; /* Simulation Expander ----------------------------------------- */ @@ -3102,22 +3099,21 @@ static void *acf_dssimulation_setting_ptr(bAnimListElem *ale, /** Simulation expander type define. */ static bAnimChannelType ACF_DSSIMULATION = { - "Simulation Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Simulation Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dssimulation_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dssimulation_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dssimulation_setting_flag, /* flag for setting */ - acf_dssimulation_setting_ptr /* pointer for setting */ -}; + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dssimulation_setting_flag, + /*setting_ptr*/ acf_dssimulation_setting_ptr}; /* GPencil Expander ------------------------------------------- */ @@ -3183,21 +3179,21 @@ static void *acf_dsgpencil_setting_ptr(bAnimListElem *ale, /** Grease-pencil expander type define. */ static bAnimChannelType ACF_DSGPENCIL = { - "GPencil DS Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "GPencil DS Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idblock_name_prop, /* name prop */ - acf_dsgpencil_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idblock_name_prop, + /*icon*/ acf_dsgpencil_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsgpencil_setting_flag, /* flag for setting */ - acf_dsgpencil_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsgpencil_setting_flag, + /*setting_ptr*/ acf_dsgpencil_setting_ptr, }; /* World Expander ------------------------------------------- */ @@ -3264,21 +3260,21 @@ static void *acf_dsmclip_setting_ptr(bAnimListElem *ale, /** Movie-clip expander type define. */ static bAnimChannelType ACF_DSMCLIP = { - "Movieclip Expander", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Movieclip Expander", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop, /* backdrop */ - acf_generic_indentation_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_dataexpand_color, + /*draw_backdrop*/ acf_generic_dataexpand_backdrop, + /*get_indent_level*/ acf_generic_indentation_1, + /*get_offset*/ acf_generic_basic_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_dsmclip_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_dsmclip_icon, - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmclip_setting_flag, /* flag for setting */ - acf_dsmclip_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_generic_dataexpand_setting_valid, + /*setting_flag*/ acf_dsmclip_setting_flag, + /*setting_ptr*/ acf_dsmclip_setting_ptr, }; /* ShapeKey Entry ------------------------------------------- */ @@ -3379,21 +3375,21 @@ static void *acf_shapekey_setting_ptr(bAnimListElem *ale, /** Shape-key expander type define. */ static bAnimChannelType ACF_SHAPEKEY = { - "Shape Key", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "Shape Key", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - acf_generic_basic_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_channel_color, + /*draw_backdrop*/ acf_generic_channel_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ acf_generic_basic_offset, - acf_shapekey_name, /* name */ - acf_shapekey_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_shapekey_name, + /*name_prop*/ acf_shapekey_name_prop, + /*icon*/ NULL, - acf_shapekey_setting_valid, /* has setting */ - acf_shapekey_setting_flag, /* flag for setting */ - acf_shapekey_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_shapekey_setting_valid, + /*setting_flag*/ acf_shapekey_setting_flag, + /*setting_ptr*/ acf_shapekey_setting_ptr, }; /* GPencil Datablock ------------------------------------------- */ @@ -3459,21 +3455,21 @@ static void *acf_gpd_setting_ptr(bAnimListElem *ale, /** Grease-pencil data-block type define. */ static bAnimChannelType ACF_GPD = { - "GPencil Datablock", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "GPencil Datablock", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_gpd_color, /* backdrop color */ - acf_group_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_gpd_color, + /*draw_backdrop*/ acf_group_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ acf_generic_group_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_gpd_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_gpd_icon, - acf_gpd_setting_valid, /* has setting */ - acf_gpd_setting_flag, /* flag for setting */ - acf_gpd_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_gpd_setting_valid, + /*setting_flag*/ acf_gpd_setting_flag, + /*setting_ptr*/ acf_gpd_setting_ptr, }; /* GPencil Layer ------------------------------------------- */ @@ -3558,21 +3554,21 @@ static void *acf_gpl_setting_ptr(bAnimListElem *ale, /** Grease-pencil layer type define. */ static bAnimChannelType ACF_GPL = { - "GPencil Layer", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "GPencil Layer", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_gpencil_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indentation_flexible, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_gpencil_channel_color, + /*draw_backdrop*/ acf_generic_channel_backdrop, + /*get_indent_level*/ acf_generic_indentation_flexible, + /*get_offset*/ acf_generic_group_offset, - acf_gpl_name, /* name */ - acf_gpl_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_gpl_name, + /*name_prop*/ acf_gpl_name_prop, + /*icon*/ NULL, - acf_gpl_setting_valid, /* has setting */ - acf_gpl_setting_flag, /* flag for setting */ - acf_gpl_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_gpl_setting_valid, + /*setting_flag*/ acf_gpl_setting_flag, + /*setting_ptr*/ acf_gpl_setting_ptr, }; /* Mask Datablock ------------------------------------------- */ @@ -3640,21 +3636,21 @@ static void *acf_mask_setting_ptr(bAnimListElem *ale, /** Mask data-block type define. */ static bAnimChannelType ACF_MASKDATA = { - "Mask Datablock", /* type name */ - ACHANNEL_ROLE_EXPANDER, /* role */ + /*channel_type_name*/ "Mask Datablock", + /*channel_role*/ ACHANNEL_ROLE_EXPANDER, - acf_mask_color, /* backdrop color */ - acf_group_backdrop, /* backdrop */ - acf_generic_indentation_0, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_mask_color, + /*draw_backdrop*/ acf_group_backdrop, + /*get_indent_level*/ acf_generic_indentation_0, + /*get_offset*/ acf_generic_group_offset, - acf_generic_idblock_name, /* name */ - acf_generic_idfill_name_prop, /* name prop */ - acf_mask_icon, /* icon */ + /*name*/ acf_generic_idblock_name, + /*name_prop*/ acf_generic_idfill_name_prop, + /*icon*/ acf_mask_icon, - acf_mask_setting_valid, /* has setting */ - acf_mask_setting_flag, /* flag for setting */ - acf_mask_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_mask_setting_valid, + /*setting_flag*/ acf_mask_setting_flag, + /*setting_ptr*/ acf_mask_setting_ptr, }; /* Mask Layer ------------------------------------------- */ @@ -3736,21 +3732,21 @@ static void *acf_masklay_setting_ptr(bAnimListElem *ale, /** Mask layer type define. */ static bAnimChannelType ACF_MASKLAYER = { - "Mask Layer", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "Mask Layer", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indentation_flexible, /* indent level */ - acf_generic_group_offset, /* offset */ + /*get_backdrop_color*/ acf_generic_channel_color, + /*draw_backdrop*/ acf_generic_channel_backdrop, + /*get_indent_level*/ acf_generic_indentation_flexible, + /*get_offset*/ acf_generic_group_offset, - acf_masklay_name, /* name */ - acf_masklay_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_masklay_name, + /*name_prop*/ acf_masklay_name_prop, + /*icon*/ NULL, - acf_masklay_setting_valid, /* has setting */ - acf_masklay_setting_flag, /* flag for setting */ - acf_masklay_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_masklay_setting_valid, + /*setting_flag*/ acf_masklay_setting_flag, + /*setting_ptr*/ acf_masklay_setting_ptr, }; /* NLA Track ----------------------------------------------- */ @@ -3876,22 +3872,21 @@ static void *acf_nlatrack_setting_ptr(bAnimListElem *ale, /** NLA track type define. */ static bAnimChannelType ACF_NLATRACK = { - "NLA Track", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "NLA Track", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, - acf_nlatrack_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indentation_flexible, /* indent level */ - acf_generic_group_offset, - /* offset */ /* XXX? */ + /*get_backdrop_color*/ acf_nlatrack_color, + /*draw_backdrop*/ acf_generic_channel_backdrop, + /*get_indent_level*/ acf_generic_indentation_flexible, + /*get_offset*/ acf_generic_group_offset, /* XXX? */ - acf_nlatrack_name, /* name */ - acf_nlatrack_name_prop, /* name prop */ - NULL, /* icon */ + /*name*/ acf_nlatrack_name, + /*name_prop*/ acf_nlatrack_name_prop, + /*icon*/ NULL, - acf_nlatrack_setting_valid, /* has setting */ - acf_nlatrack_setting_flag, /* flag for setting */ - acf_nlatrack_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_nlatrack_setting_valid, + /*setting_flag*/ acf_nlatrack_setting_flag, + /*setting_ptr*/ acf_nlatrack_setting_ptr, }; /* NLA Action ----------------------------------------------- */ @@ -4062,23 +4057,22 @@ static void *acf_nlaaction_setting_ptr(bAnimListElem *ale, /* nla action type define */ static bAnimChannelType ACF_NLAACTION = { - "NLA Active Action", /* type name */ - ACHANNEL_ROLE_CHANNEL, /* role */ + /*channel_type_name*/ "NLA Active Action", + /*channel_role*/ ACHANNEL_ROLE_CHANNEL, + /* NOTE: the backdrop handles this too, since it needs special hacks. */ + /*get_backdrop_color*/ acf_nlaaction_color, - acf_nlaaction_color, /* backdrop color (NOTE: the backdrop handles this too, - * since it needs special hacks). */ - acf_nlaaction_backdrop, /* backdrop */ - acf_generic_indentation_flexible, /* indent level */ - acf_generic_group_offset, - /* offset */ /* XXX? */ + /*draw_backdrop*/ acf_nlaaction_backdrop, + /*get_indent_level*/ acf_generic_indentation_flexible, + /*get_offset*/ acf_generic_group_offset, /* XXX? */ - acf_nlaaction_name, /* name */ - acf_nlaaction_name_prop, /* name prop */ - acf_nlaaction_icon, /* icon */ + /*name*/ acf_nlaaction_name, + /*name_prop*/ acf_nlaaction_name_prop, + /*icon*/ acf_nlaaction_icon, - acf_nlaaction_setting_valid, /* has setting */ - acf_nlaaction_setting_flag, /* flag for setting */ - acf_nlaaction_setting_ptr, /* pointer for setting */ + /*has_setting*/ acf_nlaaction_setting_valid, + /*setting_flag*/ acf_nlaaction_setting_flag, + /*setting_ptr*/ acf_nlaaction_setting_ptr, }; /* *********************************************** */ diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index dc1fab35945..aa8b5796645 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -240,7 +240,7 @@ static void select_pchan_for_action_group(bAnimContext *ac, bActionGroup *agrp, } } -static ListBase /* bAnimListElem */ anim_channels_for_selection(bAnimContext *ac) +static ListBase /*bAnimListElem*/ anim_channels_for_selection(bAnimContext *ac) { ListBase anim_data = {NULL, NULL}; diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 6df9dc1e86d..d0b978b7adf 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -480,7 +480,7 @@ static void ED_keylist_draw_list_elem_prepare_for_drawing(AnimKeylistDrawListEle } typedef struct AnimKeylistDrawList { - ListBase /* AnimKeylistDrawListElem */ channels; + ListBase /*AnimKeylistDrawListElem*/ channels; } AnimKeylistDrawList; AnimKeylistDrawList *ED_keylist_draw_list_create(void) diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc index 9b3cabb6c79..eff12af02d2 100644 --- a/source/blender/editors/animation/keyframes_keylist.cc +++ b/source/blender/editors/animation/keyframes_keylist.cc @@ -61,7 +61,7 @@ struct AnimKeylist { /* Before initializing the runtime, the key_columns list base is used to quickly add columns. * Contains `ActKeyColumn`. Should not be used after runtime is initialized. */ - ListBase /* ActKeyColumn */ key_columns; + ListBase /*ActKeyColumn*/ key_columns; /* Last accessed column in the key_columns list base. Inserting columns are typically done in * order. The last accessed column is used as starting point to search for a location to add or * update the next column. */ @@ -71,9 +71,9 @@ struct AnimKeylist { /* When initializing the runtime the columns from the list base `AnimKeyList.key_columns` are * transferred to an array to support binary searching and index based access. */ blender::Array key_columns; - /* Wrapper around runtime.key_columns so it can still be accessed as a ListBase. Elements are - * owned by runtime.key_columns. */ - ListBase /* ActKeyColumn */ list_wrapper; + /* Wrapper around runtime.key_columns so it can still be accessed as a ListBase. + * Elements are owned by `runtime.key_columns`. */ + ListBase /*ActKeyColumn*/ list_wrapper; } runtime; AnimKeylist() diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index cc38bc15364..1303be1a510 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -908,11 +908,11 @@ static bool has_external_files(Main *bmain, struct ReportList *reports) | BKE_BPATH_TRAVERSE_SKIP_WEAK_REFERENCES); /* Only care about actually used files. */ BPathForeachPathData bpath_data = { - /* bmain */ bmain, - /* callback_function */ &external_file_check_callback, - /* flag */ flag, - /* user_data */ &callback_info, - /* absolute_base_path */ nullptr, + /*bmain*/ bmain, + /*callback_function*/ &external_file_check_callback, + /*flag*/ flag, + /*user_data*/ &callback_info, + /*absolute_base_path*/ nullptr, }; BKE_bpath_foreach_path_main(&bpath_data); diff --git a/source/blender/editors/include/ED_file_indexer.h b/source/blender/editors/include/ED_file_indexer.h index c07196c9fd7..eeb0fb3124f 100644 --- a/source/blender/editors/include/ED_file_indexer.h +++ b/source/blender/editors/include/ED_file_indexer.h @@ -131,7 +131,7 @@ void ED_file_indexer_entries_clear(FileIndexerEntries *indexer_entries); */ void ED_file_indexer_entries_extend_from_datablock_infos( FileIndexerEntries *indexer_entries, - const LinkNode * /* BLODataBlockInfo */ datablock_infos, + const LinkNode * /*BLODataBlockInfo*/ datablock_infos, int idcode); #ifdef __cplusplus diff --git a/source/blender/editors/space_file/file_indexer.cc b/source/blender/editors/space_file/file_indexer.cc index 7670f475599..4ee925c256d 100644 --- a/source/blender/editors/space_file/file_indexer.cc +++ b/source/blender/editors/space_file/file_indexer.cc @@ -55,7 +55,7 @@ extern "C" { void ED_file_indexer_entries_extend_from_datablock_infos( FileIndexerEntries *indexer_entries, - const LinkNode * /* BLODataBlockInfo */ datablock_infos, + const LinkNode * /*BLODataBlockInfo*/ datablock_infos, const int idcode) { for (const LinkNode *ln = datablock_infos; ln; ln = ln->next) { diff --git a/source/blender/editors/transform/transform_convert_action.c b/source/blender/editors/transform/transform_convert_action.c index 560cc18d7d6..bd8f8237bd9 100644 --- a/source/blender/editors/transform/transform_convert_action.c +++ b/source/blender/editors/transform/transform_convert_action.c @@ -936,8 +936,8 @@ static void special_aftertrans_update__actedit(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Action = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransActionData, - /* recalcData */ recalcData_actedit, - /* special_aftertrans_update */ special_aftertrans_update__actedit, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransActionData, + /*recalcData*/ recalcData_actedit, + /*special_aftertrans_update*/ special_aftertrans_update__actedit, }; diff --git a/source/blender/editors/transform/transform_convert_armature.c b/source/blender/editors/transform/transform_convert_armature.c index ada6d1c40b2..b9b78da1993 100644 --- a/source/blender/editors/transform/transform_convert_armature.c +++ b/source/blender/editors/transform/transform_convert_armature.c @@ -1771,15 +1771,15 @@ static void special_aftertrans_update__pose(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_EditArmature = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransArmatureVerts, - /* recalcData */ recalcData_edit_armature, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransArmatureVerts, + /*recalcData*/ recalcData_edit_armature, + /*special_aftertrans_update*/ NULL, }; TransConvertTypeInfo TransConvertType_Pose = { - /* flags */ 0, - /* createTransData */ createTransPose, - /* recalcData */ recalcData_pose, - /* special_aftertrans_update */ special_aftertrans_update__pose, + /*flags*/ 0, + /*createTransData*/ createTransPose, + /*recalcData*/ recalcData_pose, + /*special_aftertrans_update*/ special_aftertrans_update__pose, }; diff --git a/source/blender/editors/transform/transform_convert_cursor.c b/source/blender/editors/transform/transform_convert_cursor.c index 0bf6f06a9f2..2b365d31068 100644 --- a/source/blender/editors/transform/transform_convert_cursor.c +++ b/source/blender/editors/transform/transform_convert_cursor.c @@ -186,22 +186,22 @@ static void recalcData_cursor_view3d(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_CursorImage = { - /* flags */ T_2D_EDIT, - /* createTransData */ createTransCursor_image, - /* recalcData */ recalcData_cursor_image, - /* special_aftertrans_update */ NULL, + /*flags*/ T_2D_EDIT, + /*createTransData*/ createTransCursor_image, + /*recalcData*/ recalcData_cursor_image, + /*special_aftertrans_update*/ NULL, }; TransConvertTypeInfo TransConvertType_CursorSequencer = { - /* flags */ T_2D_EDIT, - /* createTransData */ createTransCursor_sequencer, - /* recalcData */ recalcData_cursor_sequencer, - /* special_aftertrans_update */ NULL, + /*flags*/ T_2D_EDIT, + /*createTransData*/ createTransCursor_sequencer, + /*recalcData*/ recalcData_cursor_sequencer, + /*special_aftertrans_update*/ NULL, }; TransConvertTypeInfo TransConvertType_Cursor3D = { - /* flags */ 0, - /* createTransData */ createTransCursor_view3d, - /* recalcData */ recalcData_cursor_view3d, - /* special_aftertrans_update */ NULL, + /*flags*/ 0, + /*createTransData*/ createTransCursor_view3d, + /*recalcData*/ recalcData_cursor_view3d, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_curve.c b/source/blender/editors/transform/transform_convert_curve.c index 58ed8ad7d33..b3ee49ef7ed 100644 --- a/source/blender/editors/transform/transform_convert_curve.c +++ b/source/blender/editors/transform/transform_convert_curve.c @@ -449,8 +449,8 @@ static void recalcData_curve(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Curve = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransCurveVerts, - /* recalcData */ recalcData_curve, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransCurveVerts, + /*recalcData*/ recalcData_curve, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_gpencil.c b/source/blender/editors/transform/transform_convert_gpencil.c index 8c23f3c2b96..b4e48674892 100644 --- a/source/blender/editors/transform/transform_convert_gpencil.c +++ b/source/blender/editors/transform/transform_convert_gpencil.c @@ -766,8 +766,8 @@ static void recalcData_gpencil_strokes(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_GPencil = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransGPencil, - /* recalcData */ recalcData_gpencil_strokes, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransGPencil, + /*recalcData*/ recalcData_gpencil_strokes, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_graph.c b/source/blender/editors/transform/transform_convert_graph.c index 252c5cc3d37..68c3479fb5d 100644 --- a/source/blender/editors/transform/transform_convert_graph.c +++ b/source/blender/editors/transform/transform_convert_graph.c @@ -1035,8 +1035,8 @@ static void special_aftertrans_update__graph(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Graph = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransGraphEditData, - /* recalcData */ recalcData_graphedit, - /* special_aftertrans_update */ special_aftertrans_update__graph, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransGraphEditData, + /*recalcData*/ recalcData_graphedit, + /*special_aftertrans_update*/ special_aftertrans_update__graph, }; diff --git a/source/blender/editors/transform/transform_convert_lattice.c b/source/blender/editors/transform/transform_convert_lattice.c index bc53ce02996..077199a6257 100644 --- a/source/blender/editors/transform/transform_convert_lattice.c +++ b/source/blender/editors/transform/transform_convert_lattice.c @@ -117,8 +117,8 @@ static void recalcData_lattice(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Lattice = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransLatticeVerts, - /* recalcData */ recalcData_lattice, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransLatticeVerts, + /*recalcData*/ recalcData_lattice, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_mask.c b/source/blender/editors/transform/transform_convert_mask.c index 2dca59a5da1..5a497c925e4 100644 --- a/source/blender/editors/transform/transform_convert_mask.c +++ b/source/blender/editors/transform/transform_convert_mask.c @@ -465,8 +465,8 @@ static void special_aftertrans_update__mask(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Mask = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransMaskingData, - /* recalcData */ recalcData_mask_common, - /* special_aftertrans_update */ special_aftertrans_update__mask, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransMaskingData, + /*recalcData*/ recalcData_mask_common, + /*special_aftertrans_update*/ special_aftertrans_update__mask, }; diff --git a/source/blender/editors/transform/transform_convert_mball.c b/source/blender/editors/transform/transform_convert_mball.c index b4150539a51..adee242457d 100644 --- a/source/blender/editors/transform/transform_convert_mball.c +++ b/source/blender/editors/transform/transform_convert_mball.c @@ -135,8 +135,8 @@ static void recalcData_mball(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_MBall = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransMBallVerts, - /* recalcData */ recalcData_mball, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransMBallVerts, + /*recalcData*/ recalcData_mball, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index 34432004701..5e164dfd8ad 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -2139,8 +2139,8 @@ static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Mesh = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransEditVerts, - /* recalcData */ recalcData_mesh, - /* special_aftertrans_update */ special_aftertrans_update__mesh, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransEditVerts, + /*recalcData*/ recalcData_mesh, + /*special_aftertrans_update*/ special_aftertrans_update__mesh, }; diff --git a/source/blender/editors/transform/transform_convert_mesh_edge.c b/source/blender/editors/transform/transform_convert_mesh_edge.c index f8ea8ea9f7d..e5c2c90f957 100644 --- a/source/blender/editors/transform/transform_convert_mesh_edge.c +++ b/source/blender/editors/transform/transform_convert_mesh_edge.c @@ -122,8 +122,8 @@ static void recalcData_mesh_edge(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_MeshEdge = { - /* flags */ T_EDIT, - /* createTransData */ createTransEdge, - /* recalcData */ recalcData_mesh_edge, - /* special_aftertrans_update */ NULL, + /*flags*/ T_EDIT, + /*createTransData*/ createTransEdge, + /*recalcData*/ recalcData_mesh_edge, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_mesh_skin.c b/source/blender/editors/transform/transform_convert_mesh_skin.c index 1139e61aefb..8bd40561396 100644 --- a/source/blender/editors/transform/transform_convert_mesh_skin.c +++ b/source/blender/editors/transform/transform_convert_mesh_skin.c @@ -292,8 +292,8 @@ static void recalcData_mesh_skin(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_MeshSkin = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransMeshSkin, - /* recalcData */ recalcData_mesh_skin, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransMeshSkin, + /*recalcData*/ recalcData_mesh_skin, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_mesh_uv.c b/source/blender/editors/transform/transform_convert_mesh_uv.c index c7d5411f907..f3b8cc59871 100644 --- a/source/blender/editors/transform/transform_convert_mesh_uv.c +++ b/source/blender/editors/transform/transform_convert_mesh_uv.c @@ -470,8 +470,8 @@ static void recalcData_uv(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_MeshUV = { - /* flags */ (T_EDIT | T_POINTS | T_2D_EDIT), - /* createTransData */ createTransUVs, - /* recalcData */ recalcData_uv, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransUVs, + /*recalcData*/ recalcData_uv, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.c b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.c index 0d29892cd5e..f1428bdfebc 100644 --- a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.c +++ b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.c @@ -294,8 +294,8 @@ static void recalcData_mesh_cdata(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_MeshVertCData = { - /* flags */ (T_EDIT | T_POINTS), - /* createTransData */ createTransMeshVertCData, - /* recalcData */ recalcData_mesh_cdata, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_EDIT | T_POINTS), + /*createTransData*/ createTransMeshVertCData, + /*recalcData*/ recalcData_mesh_cdata, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c index ab71fe42f07..f38d25b440b 100644 --- a/source/blender/editors/transform/transform_convert_nla.c +++ b/source/blender/editors/transform/transform_convert_nla.c @@ -542,8 +542,8 @@ static void special_aftertrans_update__nla(bContext *C, TransInfo *UNUSED(t)) /** \} */ TransConvertTypeInfo TransConvertType_NLA = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransNlaData, - /* recalcData */ recalcData_nla, - /* special_aftertrans_update */ special_aftertrans_update__nla, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransNlaData, + /*recalcData*/ recalcData_nla, + /*special_aftertrans_update*/ special_aftertrans_update__nla, }; diff --git a/source/blender/editors/transform/transform_convert_node.cc b/source/blender/editors/transform/transform_convert_node.cc index 1c35323a154..13095ff6f5a 100644 --- a/source/blender/editors/transform/transform_convert_node.cc +++ b/source/blender/editors/transform/transform_convert_node.cc @@ -303,8 +303,8 @@ static void special_aftertrans_update__node(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Node = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransNodeData, - /* recalcData */ flushTransNodes, - /* special_aftertrans_update */ special_aftertrans_update__node, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransNodeData, + /*recalcData*/ flushTransNodes, + /*special_aftertrans_update*/ special_aftertrans_update__node, }; diff --git a/source/blender/editors/transform/transform_convert_object.c b/source/blender/editors/transform/transform_convert_object.c index 401d72485c8..045b737c4f7 100644 --- a/source/blender/editors/transform/transform_convert_object.c +++ b/source/blender/editors/transform/transform_convert_object.c @@ -1006,8 +1006,8 @@ static void special_aftertrans_update__object(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Object = { - /* flags */ 0, - /* createTransData */ createTransObject, - /* recalcData */ recalcData_objects, - /* special_aftertrans_update */ special_aftertrans_update__object, + /*flags*/ 0, + /*createTransData*/ createTransObject, + /*recalcData*/ recalcData_objects, + /*special_aftertrans_update*/ special_aftertrans_update__object, }; diff --git a/source/blender/editors/transform/transform_convert_object_texspace.c b/source/blender/editors/transform/transform_convert_object_texspace.c index cd2a3d6a40b..fb82f1645f5 100644 --- a/source/blender/editors/transform/transform_convert_object_texspace.c +++ b/source/blender/editors/transform/transform_convert_object_texspace.c @@ -110,8 +110,8 @@ static void recalcData_texspace(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_ObjectTexSpace = { - /* flags */ 0, - /* createTransData */ createTransTexspace, - /* recalcData */ recalcData_texspace, - /* special_aftertrans_update */ NULL, + /*flags*/ 0, + /*createTransData*/ createTransTexspace, + /*recalcData*/ recalcData_texspace, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_paintcurve.c b/source/blender/editors/transform/transform_convert_paintcurve.c index 61b1cb9493b..71593ceed80 100644 --- a/source/blender/editors/transform/transform_convert_paintcurve.c +++ b/source/blender/editors/transform/transform_convert_paintcurve.c @@ -206,8 +206,8 @@ static void flushTransPaintCurve(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_PaintCurve = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransPaintCurveVerts, - /* recalcData */ flushTransPaintCurve, - /* special_aftertrans_update */ NULL, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransPaintCurveVerts, + /*recalcData*/ flushTransPaintCurve, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_particle.c b/source/blender/editors/transform/transform_convert_particle.c index f1bda0a5a35..9914a64ab5b 100644 --- a/source/blender/editors/transform/transform_convert_particle.c +++ b/source/blender/editors/transform/transform_convert_particle.c @@ -249,8 +249,8 @@ static void recalcData_particles(TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Particle = { - /* flags */ T_POINTS, - /* createTransData */ createTransParticleVerts, - /* recalcData */ recalcData_particles, - /* special_aftertrans_update */ NULL, + /*flags*/ T_POINTS, + /*createTransData*/ createTransParticleVerts, + /*recalcData*/ recalcData_particles, + /*special_aftertrans_update*/ NULL, }; diff --git a/source/blender/editors/transform/transform_convert_sculpt.c b/source/blender/editors/transform/transform_convert_sculpt.c index cdbf497c584..cdd46e08c5c 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.c +++ b/source/blender/editors/transform/transform_convert_sculpt.c @@ -120,8 +120,8 @@ static void special_aftertrans_update__sculpt(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Sculpt = { - /* flags */ 0, - /* createTransData */ createTransSculpt, - /* recalcData */ recalcData_sculpt, - /* special_aftertrans_update */ special_aftertrans_update__sculpt, + /*flags*/ 0, + /*createTransData*/ createTransSculpt, + /*recalcData*/ recalcData_sculpt, + /*special_aftertrans_update*/ special_aftertrans_update__sculpt, }; diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index 80c74b81cfa..8a42ac8a73d 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -734,8 +734,8 @@ void transform_convert_sequencer_channel_clamp(TransInfo *t, float r_val[2]) /** \} */ TransConvertTypeInfo TransConvertType_Sequencer = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransSeqData, - /* recalcData */ recalcData_sequencer, - /* special_aftertrans_update */ special_aftertrans_update__sequencer, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransSeqData, + /*recalcData*/ recalcData_sequencer, + /*special_aftertrans_update*/ special_aftertrans_update__sequencer, }; diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.c b/source/blender/editors/transform/transform_convert_sequencer_image.c index 668cb719b2b..ee80c616bd5 100644 --- a/source/blender/editors/transform/transform_convert_sequencer_image.c +++ b/source/blender/editors/transform/transform_convert_sequencer_image.c @@ -278,8 +278,8 @@ static void special_aftertrans_update__sequencer_image(bContext *UNUSED(C), Tran } TransConvertTypeInfo TransConvertType_SequencerImage = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransSeqImageData, - /* recalcData */ recalcData_sequencer_image, - /* special_aftertrans_update */ special_aftertrans_update__sequencer_image, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransSeqImageData, + /*recalcData*/ recalcData_sequencer_image, + /*special_aftertrans_update*/ special_aftertrans_update__sequencer_image, }; diff --git a/source/blender/editors/transform/transform_convert_tracking.c b/source/blender/editors/transform/transform_convert_tracking.c index 6aa53291173..0adb3b75aec 100644 --- a/source/blender/editors/transform/transform_convert_tracking.c +++ b/source/blender/editors/transform/transform_convert_tracking.c @@ -779,8 +779,8 @@ static void special_aftertrans_update__movieclip(bContext *C, TransInfo *t) /** \} */ TransConvertTypeInfo TransConvertType_Tracking = { - /* flags */ (T_POINTS | T_2D_EDIT), - /* createTransData */ createTransTrackingData, - /* recalcData */ recalcData_tracking, - /* special_aftertrans_update */ special_aftertrans_update__movieclip, + /*flags*/ (T_POINTS | T_2D_EDIT), + /*createTransData*/ createTransTrackingData, + /*recalcData*/ recalcData_tracking, + /*special_aftertrans_update*/ special_aftertrans_update__movieclip, }; diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index af9ef7f352e..533ad18d927 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -72,12 +72,11 @@ static void load_post_callback(struct Main * /*main*/, } static bCallbackFuncStore load_post_callback_funcstore = { - nullptr, /* next */ - nullptr, /* prev */ - load_post_callback, /* func */ - nullptr, /* arg */ - 0 /* alloc */ -}; + /*next*/ nullptr, + /*prev*/ nullptr, + /*func*/ load_post_callback, + /*arg*/ nullptr, + /*alloc*/ 0}; //======================================================= // Initialization diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index 5163f4d7020..a3665920d15 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -189,24 +189,24 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Armature = { - /* name */ N_("Armature"), - /* structName */ "ArmatureGpencilModifierData", - /* structSize */ sizeof(ArmatureGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Armature"), + /*structName*/ "ArmatureGpencilModifierData", + /*structSize*/ sizeof(ArmatureGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index e85011639c2..c8ab376bed9 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -485,25 +485,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Array = { - /* name */ N_("Array"), - /* structName */ "ArrayGpencilModifierData", - /* structSize */ sizeof(ArrayGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Array"), + /*structName*/ "ArrayGpencilModifierData", + /*structSize*/ sizeof(ArrayGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c index 2d2d36ab20e..b8afe9144b1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c @@ -1038,25 +1038,25 @@ static void updateDepsgraph(GpencilModifierData *md, /* ******************************************** */ GpencilModifierTypeInfo modifierType_Gpencil_Build = { - /* name */ N_("Build"), - /* structName */ "BuildGpencilModifierData", - /* structSize */ sizeof(BuildGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_NoApply, + /*name*/ N_("Build"), + /*structName*/ "BuildGpencilModifierData", + /*structSize*/ sizeof(BuildGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_NoApply, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ NULL, - /* remapTime */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ NULL, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 7abbd0661cf..9a237630bc8 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -204,25 +204,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Color = { - /* name */ N_("Hue/Saturation"), - /* structName */ "ColorGpencilModifierData", - /* structSize */ sizeof(ColorGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Hue/Saturation"), + /*structName*/ "ColorGpencilModifierData", + /*structSize*/ sizeof(ColorGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c index 52b0eb79978..2ff2a0eb1fa 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c @@ -367,25 +367,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Dash = { - /* name */ N_("Dot Dash"), - /* structName */ "DashGpencilModifierData", - /* structSize */ sizeof(DashGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Dot Dash"), + /*structName*/ "DashGpencilModifierData", + /*structSize*/ sizeof(DashGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c index ec0ed1f6a35..8a88cc0a01e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c @@ -645,25 +645,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Envelope = { - /* name */ N_("Envelope"), - /* structName */ "EnvelopeGpencilModifierData", - /* structSize */ sizeof(EnvelopeGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Envelope"), + /*structName*/ "EnvelopeGpencilModifierData", + /*structSize*/ sizeof(EnvelopeGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index e3b4e1c5e02..04b4ca469af 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -387,25 +387,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Hook = { - /* name */ N_("Hook"), - /* structName */ "HookGpencilModifierData", - /* structSize */ sizeof(HookGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Hook"), + /*structName*/ "HookGpencilModifierData", + /*structSize*/ sizeof(HookGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index 7365c59dd5f..051ad2cd1bb 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -247,25 +247,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Lattice = { - /* name */ N_("Lattice"), - /* structName */ "LatticeGpencilModifierData", - /* structSize */ sizeof(LatticeGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Lattice"), + /*structName*/ "LatticeGpencilModifierData", + /*structSize*/ sizeof(LatticeGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c index b4dac1557f0..a6e8d417699 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c @@ -355,25 +355,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Length = { - /* name */ N_("Length"), - /* structName */ "LengthGpencilModifierData", - /* structSize */ sizeof(LengthGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Length"), + /*structName*/ "LengthGpencilModifierData", + /*structSize*/ sizeof(LengthGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c index ec4cf71e00c..b33a6970d1f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c @@ -809,25 +809,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Lineart = { - /* name. */ "Line Art", - /* structName. */ "LineartGpencilModifierData", - /* structSize. */ sizeof(LineartGpencilModifierData), - /* type. */ eGpencilModifierTypeType_Gpencil, - /* flags. */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ "Line Art", + /*structName*/ "LineartGpencilModifierData", + /*structSize*/ sizeof(LineartGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData. */ copyData, + /*copyData*/ copyData, - /* deformStroke. */ NULL, - /* generateStrokes. */ generateStrokes, - /* bakeModifier. */ bakeModifier, - /* remapTime. */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData. */ initData, - /* freeData. */ NULL, - /* isDisabled. */ isDisabled, - /* updateDepsgraph. */ updateDepsgraph, - /* dependsOnTime. */ NULL, - /* foreachIDLink. */ foreachIDLink, - /* foreachTexLink. */ NULL, - /* panelRegister. */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index bc91094e80e..65c5c2a8b37 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -243,25 +243,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Mirror = { - /* name */ N_("Mirror"), - /* structName */ "MirrorGpencilModifierData", - /* structSize */ sizeof(MirrorGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Mirror"), + /*structName*/ "MirrorGpencilModifierData", + /*structSize*/ sizeof(MirrorGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c index cb4a7893080..ad0fd915c81 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c @@ -313,25 +313,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Multiply = { - /* name */ N_("MultipleStrokes"), - /* structName */ "MultiplyGpencilModifierData", - /* structSize */ sizeof(MultiplyGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ 0, + /*name*/ N_("MultipleStrokes"), + /*structName*/ "MultiplyGpencilModifierData", + /*structSize*/ sizeof(MultiplyGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index 4bbcbf775db..100df37f402 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -339,25 +339,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Noise = { - /* name */ N_("Noise"), - /* structName */ "NoiseGpencilModifierData", - /* structSize */ sizeof(NoiseGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Noise"), + /*structName*/ "NoiseGpencilModifierData", + /*structSize*/ sizeof(NoiseGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ dependsOnTime, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ dependsOnTime, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index 1beebc3cbe8..e40c6e9df4d 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -309,25 +309,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Offset = { - /* name */ N_("Offset"), - /* structName */ "OffsetGpencilModifierData", - /* structSize */ sizeof(OffsetGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Offset"), + /*structName*/ "OffsetGpencilModifierData", + /*structSize*/ sizeof(OffsetGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index 98f26dbd597..34ae3b460a4 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -279,25 +279,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Opacity = { - /* name */ N_("Opacity"), - /* structName */ "OpacityGpencilModifierData", - /* structSize */ sizeof(OpacityGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Opacity"), + /*structName*/ "OpacityGpencilModifierData", + /*structSize*/ sizeof(OpacityGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c index dff8d14564a..32a54bbee4c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c @@ -324,25 +324,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Outline = { - /* name */ N_("Outline"), - /* structName */ "OutlineGpencilModifierData", - /* structSize */ sizeof(OutlineGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Outline"), + /*structName*/ "OutlineGpencilModifierData", + /*structSize*/ sizeof(OutlineGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ generateStrokes, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ NULL, + /*generateStrokes*/ generateStrokes, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c index 74b7efb1d04..ae0eb5a0a25 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c @@ -306,25 +306,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Shrinkwrap = { - /* name */ N_("Shrinkwrap"), - /* structName */ "ShrinkwrapGpencilModifierData", - /* structSize */ sizeof(ShrinkwrapGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Shrinkwrap"), + /*structName*/ "ShrinkwrapGpencilModifierData", + /*structSize*/ sizeof(ShrinkwrapGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c index 41de8d74257..f1826c3a59d 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c @@ -159,25 +159,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Simplify = { - /* name */ N_("Simplify"), - /* structName */ "SimplifyGpencilModifierData", - /* structSize */ sizeof(SimplifyGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Simplify"), + /*structName*/ "SimplifyGpencilModifierData", + /*structSize*/ sizeof(SimplifyGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c index 977be634490..cba7895c85d 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c @@ -203,25 +203,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Smooth = { - /* name */ N_("Smooth"), - /* structName */ "SmoothGpencilModifierData", - /* structSize */ sizeof(SmoothGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Smooth"), + /*structName*/ "SmoothGpencilModifierData", + /*structSize*/ sizeof(SmoothGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c index b856f7d81dc..091d9b42bb1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c @@ -124,25 +124,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Subdiv = { - /* name */ N_("Subdivide"), - /* structName */ "SubdivGpencilModifierData", - /* structSize */ sizeof(SubdivGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Subdivide"), + /*structName*/ "SubdivGpencilModifierData", + /*structSize*/ sizeof(SubdivGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c index 16c8365153a..6d1166e9f5b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c @@ -178,25 +178,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Texture = { - /* name */ N_("TextureMapping"), - /* structName */ "TextureGpencilModifierData", - /* structSize */ sizeof(TextureGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("TextureMapping"), + /*structName*/ "TextureGpencilModifierData", + /*structSize*/ sizeof(TextureGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 81343fb5180..cd683544a42 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -206,25 +206,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Thick = { - /* name */ N_("Thickness"), - /* structName */ "ThickGpencilModifierData", - /* structSize */ sizeof(ThickGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Thickness"), + /*structName*/ "ThickGpencilModifierData", + /*structSize*/ sizeof(ThickGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c index 68773886cf4..ed94581b628 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c @@ -421,25 +421,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Time = { - /* name */ N_("TimeOffset"), - /* structName */ "TimeGpencilModifierData", - /* structSize */ sizeof(TimeGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_NoApply, + /*name*/ N_("TimeOffset"), + /*structName*/ "TimeGpencilModifierData", + /*structSize*/ sizeof(TimeGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_NoApply, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ NULL, - /* generateStrokes */ NULL, - /* bakeModifier */ NULL, - /* remapTime */ remapTime, + /*deformStroke*/ NULL, + /*generateStrokes*/ NULL, + /*bakeModifier*/ NULL, + /*remapTime*/ remapTime, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index 8331188fbd8..7ca28e69886 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -367,25 +367,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Tint = { - /* name */ N_("Tint"), - /* structName */ "TintGpencilModifierData", - /* structSize */ sizeof(TintGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ eGpencilModifierTypeFlag_SupportsEditmode, + /*name*/ N_("Tint"), + /*structName*/ "TintGpencilModifierData", + /*structSize*/ sizeof(TintGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ eGpencilModifierTypeFlag_SupportsEditmode, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c index e9761732614..ac56b88d221 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c @@ -211,25 +211,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_WeightAngle = { - /* name */ N_("Vertex Weight Angle"), - /* structName */ "WeightAngleGpencilModifierData", - /* structSize */ sizeof(WeightAngleGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ 0, + /*name*/ N_("Vertex Weight Angle"), + /*structName*/ "WeightAngleGpencilModifierData", + /*structSize*/ sizeof(WeightAngleGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c index ddf852bcd11..f0c7632e828 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c @@ -228,25 +228,25 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_WeightProximity = { - /* name */ N_("Vertex Weight Proximity"), - /* structName */ "WeightProxGpencilModifierData", - /* structSize */ sizeof(WeightProxGpencilModifierData), - /* type */ eGpencilModifierTypeType_Gpencil, - /* flags */ 0, + /*name*/ N_("Vertex Weight Proximity"), + /*structName*/ "WeightProxGpencilModifierData", + /*structSize*/ sizeof(WeightProxGpencilModifierData), + /*type*/ eGpencilModifierTypeType_Gpencil, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformStroke */ deformStroke, - /* generateStrokes */ NULL, - /* bakeModifier */ bakeModifier, - /* remapTime */ NULL, + /*deformStroke*/ deformStroke, + /*generateStrokes*/ NULL, + /*bakeModifier*/ bakeModifier, + /*remapTime*/ NULL, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index b16d127a643..d8511224f6e 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -987,7 +987,7 @@ static void rna_def_keyblock(BlenderRNA *brna) RNA_def_function_ui_description(func, "Compute local space vertices' normals for this shape key"); RNA_def_function_flag(func, FUNC_USE_SELF_ID); - parm = RNA_def_property(func, "normals", PROP_FLOAT, /* PROP_DIRECTION */ PROP_NONE); + parm = RNA_def_property(func, "normals", PROP_FLOAT, /*PROP_DIRECTION*/ PROP_NONE); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_OUTPUT); RNA_def_property_multi_array(parm, 2, NULL); RNA_def_property_range(parm, -1.0f, 1.0f); @@ -996,7 +996,7 @@ static void rna_def_keyblock(BlenderRNA *brna) func = RNA_def_function(srna, "normals_polygon_get", "rna_KeyBlock_normals_poly_calc"); RNA_def_function_ui_description(func, "Compute local space faces' normals for this shape key"); RNA_def_function_flag(func, FUNC_USE_SELF_ID); - parm = RNA_def_property(func, "normals", PROP_FLOAT, /* PROP_DIRECTION */ PROP_NONE); + parm = RNA_def_property(func, "normals", PROP_FLOAT, /*PROP_DIRECTION*/ PROP_NONE); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_OUTPUT); RNA_def_property_multi_array(parm, 2, NULL); RNA_def_property_range(parm, -1.0f, 1.0f); @@ -1006,7 +1006,7 @@ static void rna_def_keyblock(BlenderRNA *brna) RNA_def_function_ui_description(func, "Compute local space face corners' normals for this shape key"); RNA_def_function_flag(func, FUNC_USE_SELF_ID); - parm = RNA_def_property(func, "normals", PROP_FLOAT, /* PROP_DIRECTION */ PROP_NONE); + parm = RNA_def_property(func, "normals", PROP_FLOAT, /*PROP_DIRECTION*/ PROP_NONE); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_OUTPUT); RNA_def_property_multi_array(parm, 2, NULL); RNA_def_property_range(parm, -1.0f, 1.0f); diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index e8aac290dd5..98adb456b23 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -260,35 +260,35 @@ static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) } ModifierTypeInfo modifierType_Armature = { - /* name */ N_("Armature"), - /* structName */ "ArmatureModifierData", - /* structSize */ sizeof(ArmatureModifierData), - /* srna */ &RNA_ArmatureModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Armature"), + /*structName*/ "ArmatureModifierData", + /*structSize*/ sizeof(ArmatureModifierData), + /*srna*/ &RNA_ArmatureModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_ARMATURE, + /*icon*/ ICON_MOD_ARMATURE, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ deformMatrices, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ deformMatricesEM, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ deformMatrices, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ deformMatricesEM, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc index 6c15994e865..512ef154516 100644 --- a/source/blender/modifiers/intern/MOD_array.cc +++ b/source/blender/modifiers/intern/MOD_array.cc @@ -1000,36 +1000,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Array = { - /* name */ N_("Array"), - /* structName */ "ArrayModifierData", - /* structSize */ sizeof(ArrayModifierData), - /* srna */ &RNA_ArrayModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("Array"), + /*structName*/ "ArrayModifierData", + /*structSize*/ sizeof(ArrayModifierData), + /*srna*/ &RNA_ArrayModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_MOD_ARRAY, + /*icon*/ ICON_MOD_ARRAY, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 48d355d8ca7..f49888a17fd 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -419,32 +419,32 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_Bevel = { - /* name */ N_("Bevel"), - /* structName */ "BevelModifierData", - /* structSize */ sizeof(BevelModifierData), - /* srna */ &RNA_BevelModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | + /*name*/ N_("Bevel"), + /*structName*/ "BevelModifierData", + /*structSize*/ sizeof(BevelModifierData), + /*srna*/ &RNA_BevelModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_MOD_BEVEL, - /* copyData */ copyData, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* uiPanel */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*icon*/ ICON_MOD_BEVEL, + /*copyData*/ copyData, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*uiPanel*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 6175455867e..207eceec431 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -664,35 +664,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Boolean = { - /* name */ N_("Boolean"), - /* structName */ "BooleanModifierData", - /* structSize */ sizeof(BooleanModifierData), - /* srna */ &RNA_BooleanModifier, - /* type */ eModifierTypeType_Nonconstructive, - /* flags */ + /*name*/ N_("Boolean"), + /*structName*/ "BooleanModifierData", + /*structSize*/ sizeof(BooleanModifierData), + /*srna*/ &RNA_BooleanModifier, + /*type*/ eModifierTypeType_Nonconstructive, + /*flags*/ (ModifierTypeFlag)(eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode), - /* icon */ ICON_MOD_BOOLEAN, + /*icon*/ ICON_MOD_BOOLEAN, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index c6bda4a707b..b2c9995a928 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -309,34 +309,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Build = { - /* name */ N_("Build"), - /* structName */ "BuildModifierData", - /* structSize */ sizeof(BuildModifierData), - /* srna */ &RNA_BuildModifier, - /* type */ eModifierTypeType_Nonconstructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_MOD_BUILD, + /*name*/ N_("Build"), + /*structName*/ "BuildModifierData", + /*structSize*/ sizeof(BuildModifierData), + /*srna*/ &RNA_BuildModifier, + /*type*/ eModifierTypeType_Nonconstructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs, + /*icon*/ ICON_MOD_BUILD, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index b6e1b5e88c1..cb15ef965f9 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -557,35 +557,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Cast = { - /* name */ N_("Cast"), - /* structName */ "CastModifierData", - /* structSize */ sizeof(CastModifierData), - /* srna */ &RNA_CastModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Cast"), + /*structName*/ "CastModifierData", + /*structSize*/ sizeof(CastModifierData), + /*srna*/ &RNA_CastModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_CAST, + /*icon*/ ICON_MOD_CAST, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 379ed32fce5..baed03692cb 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -274,35 +274,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Cloth = { - /* name */ N_("Cloth"), - /* structName */ "ClothModifierData", - /* structSize */ sizeof(ClothModifierData), - /* srna */ &RNA_ClothModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_UsesPointCache | + /*name*/ N_("Cloth"), + /*structName*/ "ClothModifierData", + /*structSize*/ sizeof(ClothModifierData), + /*srna*/ &RNA_ClothModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single, - /* icon */ ICON_MOD_CLOTH, + /*icon*/ ICON_MOD_CLOTH, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index f933bcff360..5f5cbfc342d 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -283,34 +283,34 @@ static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) } ModifierTypeInfo modifierType_Collision = { - /* name */ N_("Collision"), - /* structName */ "CollisionModifierData", - /* structSize */ sizeof(CollisionModifierData), - /* srna */ &RNA_CollisionModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_Single, - /* icon */ ICON_MOD_PHYSICS, + /*name*/ N_("Collision"), + /*structName*/ "CollisionModifierData", + /*structSize*/ sizeof(CollisionModifierData), + /*srna*/ &RNA_CollisionModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_Single, + /*icon*/ ICON_MOD_PHYSICS, - /* copyData */ NULL, + /*copyData*/ NULL, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ NULL, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index 5a9f7c657eb..50b6c7fcb32 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -842,34 +842,34 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_CorrectiveSmooth = { - /* name */ N_("CorrectiveSmooth"), - /* structName */ "CorrectiveSmoothModifierData", - /* structSize */ sizeof(CorrectiveSmoothModifierData), - /* srna */ &RNA_CorrectiveSmoothModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_SMOOTH, + /*name*/ N_("CorrectiveSmooth"), + /*structName*/ "CorrectiveSmoothModifierData", + /*structSize*/ sizeof(CorrectiveSmoothModifierData), + /*srna*/ &RNA_CorrectiveSmoothModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_SMOOTH, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 16c97d486da..7672fd20ae5 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -201,35 +201,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Curve = { - /* name */ N_("Curve"), - /* structName */ "CurveModifierData", - /* structSize */ sizeof(CurveModifierData), - /* srna */ &RNA_CurveModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Curve"), + /*structName*/ "CurveModifierData", + /*structSize*/ sizeof(CurveModifierData), + /*srna*/ &RNA_CurveModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_CURVE, + /*icon*/ ICON_MOD_CURVE, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc index 40411f06ef3..7ac834c804a 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.cc +++ b/source/blender/modifiers/intern/MOD_datatransfer.cc @@ -480,35 +480,35 @@ static void panelRegister(ARegionType *region_type) #undef DT_TYPES_AFFECT_MESH ModifierTypeInfo modifierType_DataTransfer = { - /* name */ N_("DataTransfer"), - /* structName */ "DataTransferModifierData", - /* structSize */ sizeof(DataTransferModifierData), - /* srna */ &RNA_DataTransferModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("DataTransfer"), + /*structName*/ "DataTransferModifierData", + /*structSize*/ sizeof(DataTransferModifierData), + /*srna*/ &RNA_DataTransferModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_UsesPreview, - /* icon */ ICON_MOD_DATA_TRANSFER, + /*icon*/ ICON_MOD_DATA_TRANSFER, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 059ded4f873..cf698669397 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -269,34 +269,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Decimate = { - /* name */ N_("Decimate"), - /* structName */ "DecimateModifierData", - /* structSize */ sizeof(DecimateModifierData), - /* srna */ &RNA_DecimateModifier, - /* type */ eModifierTypeType_Nonconstructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_MOD_DECIM, + /*name*/ N_("Decimate"), + /*structName*/ "DecimateModifierData", + /*structSize*/ sizeof(DecimateModifierData), + /*srna*/ &RNA_DecimateModifier, + /*type*/ eModifierTypeType_Nonconstructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs, + /*icon*/ ICON_MOD_DECIM, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index 304c4be3e02..acbb64dfc55 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -467,34 +467,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Displace = { - /* name */ N_("Displace"), - /* structName */ "DisplaceModifierData", - /* structSize */ sizeof(DisplaceModifierData), - /* srna */ &RNA_DisplaceModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_DISPLACE, + /*name*/ N_("Displace"), + /*structName*/ "DisplaceModifierData", + /*structSize*/ sizeof(DisplaceModifierData), + /*srna*/ &RNA_DisplaceModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_DISPLACE, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ nullptr, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ nullptr, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ nullptr, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 2f6d0da1fde..fd407883323 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -187,36 +187,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_DynamicPaint = { - /* name */ N_("Dynamic Paint"), - /* structName */ "DynamicPaintModifierData", - /* structSize */ sizeof(DynamicPaintModifierData), - /* srna */ &RNA_DynamicPaintModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("Dynamic Paint"), + /*structName*/ "DynamicPaintModifierData", + /*structSize*/ sizeof(DynamicPaintModifierData), + /*srna*/ &RNA_DynamicPaintModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single | eModifierTypeFlag_UsesPreview, - /* icon */ ICON_MOD_DYNAMICPAINT, + /*icon*/ ICON_MOD_DYNAMICPAINT, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ freeRuntimeData, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ freeRuntimeData, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index b381ff32aa2..7db6c5e172d 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -154,36 +154,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_EdgeSplit = { - /* name */ N_("EdgeSplit"), - /* structName */ "EdgeSplitModifierData", - /* structSize */ sizeof(EdgeSplitModifierData), - /* srna */ &RNA_EdgeSplitModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*name*/ N_("EdgeSplit"), + /*structName*/ "EdgeSplitModifierData", + /*structSize*/ sizeof(EdgeSplitModifierData), + /*srna*/ &RNA_EdgeSplitModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_EDGESPLIT, + /*icon*/ ICON_MOD_EDGESPLIT, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 9dcbb1f16a0..ebce5bb105b 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -1218,33 +1218,33 @@ static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) } ModifierTypeInfo modifierType_Explode = { - /* name */ N_("Explode"), - /* structName */ "ExplodeModifierData", - /* structSize */ sizeof(ExplodeModifierData), - /* srna */ &RNA_ExplodeModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh, - /* icon */ ICON_MOD_EXPLODE, - /* copyData */ copyData, + /*name*/ N_("Explode"), + /*structName*/ "ExplodeModifierData", + /*structSize*/ sizeof(ExplodeModifierData), + /*srna*/ &RNA_ExplodeModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh, + /*icon*/ ICON_MOD_EXPLODE, + /*copyData*/ copyData, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_fluid.c b/source/blender/modifiers/intern/MOD_fluid.c index 0a2b01fe101..5ac4c6b70da 100644 --- a/source/blender/modifiers/intern/MOD_fluid.c +++ b/source/blender/modifiers/intern/MOD_fluid.c @@ -239,34 +239,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Fluid = { - /* name */ N_("Fluid"), - /* structName */ "FluidModifierData", - /* structSize */ sizeof(FluidModifierData), - /* srna */ &RNA_FluidModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_Single, - /* icon */ ICON_MOD_FLUIDSIM, + /*name*/ N_("Fluid"), + /*structName*/ "FluidModifierData", + /*structSize*/ sizeof(FluidModifierData), + /*srna*/ &RNA_FluidModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_Single, + /*icon*/ ICON_MOD_FLUIDSIM, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 231c65998e0..de9167088b2 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -542,34 +542,34 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_Hook = { - /* name */ N_("Hook"), - /* structName */ "HookModifierData", - /* structSize */ sizeof(HookModifierData), - /* srna */ &RNA_HookModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Hook"), + /*structName*/ "HookModifierData", + /*structSize*/ sizeof(HookModifierData), + /*srna*/ &RNA_HookModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_HOOK, - /* copyData */ copyData, + /*icon*/ ICON_HOOK, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index b2b97bc0d08..aa8e7d541f0 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -871,33 +871,33 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_LaplacianDeform = { - /* name */ N_("LaplacianDeform"), - /* structName */ "LaplacianDeformModifierData", - /* structSize */ sizeof(LaplacianDeformModifierData), - /* srna */ &RNA_LaplacianDeformModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_MESHDEFORM, - /* copyData */ copyData, + /*name*/ N_("LaplacianDeform"), + /*structName*/ "LaplacianDeformModifierData", + /*structSize*/ sizeof(LaplacianDeformModifierData), + /*srna*/ &RNA_LaplacianDeformModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_MESHDEFORM, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 1534708ac72..77e0fadf75e 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -604,34 +604,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_LaplacianSmooth = { - /* name */ N_("LaplacianSmooth"), - /* structName */ "LaplacianSmoothModifierData", - /* structSize */ sizeof(LaplacianSmoothModifierData), - /* srna */ &RNA_LaplacianSmoothModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_SMOOTH, + /*name*/ N_("LaplacianSmooth"), + /*structName*/ "LaplacianSmoothModifierData", + /*structSize*/ sizeof(LaplacianSmoothModifierData), + /*srna*/ &RNA_LaplacianSmoothModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_SMOOTH, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ init_data, - /* requiredDataMask */ required_data_mask, - /* freeData */ NULL, - /* isDisabled */ is_disabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ init_data, + /*requiredDataMask*/ required_data_mask, + /*freeData*/ NULL, + /*isDisabled*/ is_disabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index ede2d7b581e..e1b8957e2e7 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -158,35 +158,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Lattice = { - /* name */ N_("Lattice"), - /* structName */ "LatticeModifierData", - /* structSize */ sizeof(LatticeModifierData), - /* srna */ &RNA_LatticeModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Lattice"), + /*structName*/ "LatticeModifierData", + /*structSize*/ sizeof(LatticeModifierData), + /*srna*/ &RNA_LatticeModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_LATTICE, + /*icon*/ ICON_MOD_LATTICE, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 9349ddc4aaa..1269907971c 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -807,36 +807,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Mask = { - /* name */ N_("Mask"), - /* structName */ "MaskModifierData", - /* structSize */ sizeof(MaskModifierData), - /* srna */ &RNA_MaskModifier, - /* type */ eModifierTypeType_Nonconstructive, - /* flags */ + /*name*/ N_("Mask"), + /*structName*/ "MaskModifierData", + /*structSize*/ sizeof(MaskModifierData), + /*srna*/ &RNA_MaskModifier, + /*type*/ eModifierTypeType_Nonconstructive, + /*flags*/ (ModifierTypeFlag)(eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode), - /* icon */ ICON_MOD_MASK, + /*icon*/ ICON_MOD_MASK, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc index fa7f0690675..22a2b383683 100644 --- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc +++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc @@ -204,34 +204,34 @@ static void modifyGeometrySet(ModifierData *md, } ModifierTypeInfo modifierType_MeshToVolume = { - /* name */ N_("Mesh to Volume"), - /* structName */ "MeshToVolumeModifierData", - /* structSize */ sizeof(MeshToVolumeModifierData), - /* srna */ &RNA_MeshToVolumeModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ static_cast(0), - /* icon */ ICON_VOLUME_DATA, /* TODO: Use correct icon. */ + /*name*/ N_("Mesh to Volume"), + /*structName*/ "MeshToVolumeModifierData", + /*structSize*/ sizeof(MeshToVolumeModifierData), + /*srna*/ &RNA_MeshToVolumeModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ static_cast(0), + /*icon*/ ICON_VOLUME_DATA, /* TODO: Use correct icon. */ - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ nullptr, - /* modifyGeometrySet */ modifyGeometrySet, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ nullptr, + /*modifyGeometrySet*/ modifyGeometrySet, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index b7cb97bec1d..da1e2c9e703 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -402,35 +402,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_MeshCache = { - /* name */ N_("MeshCache"), - /* structName */ "MeshCacheModifierData", - /* structSize */ sizeof(MeshCacheModifierData), - /* srna */ &RNA_MeshCacheModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("MeshCache"), + /*structName*/ "MeshCacheModifierData", + /*structSize*/ sizeof(MeshCacheModifierData), + /*srna*/ &RNA_MeshCacheModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_MESHDEFORM, /* TODO: Use correct icon. */ + /*icon*/ ICON_MOD_MESHDEFORM, /* TODO: Use correct icon. */ - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 2aaaee2ccc7..3cbcf9845de 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -646,35 +646,35 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_MeshDeform = { - /* name */ N_("MeshDeform"), - /* structName */ "MeshDeformModifierData", - /* structSize */ sizeof(MeshDeformModifierData), - /* srna */ &RNA_MeshDeformModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("MeshDeform"), + /*structName*/ "MeshDeformModifierData", + /*structSize*/ sizeof(MeshDeformModifierData), + /*srna*/ &RNA_MeshDeformModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_MESHDEFORM, + /*icon*/ ICON_MOD_MESHDEFORM, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index 15fa7645430..c8628a7693e 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -422,35 +422,35 @@ static void blendRead(BlendDataReader * /*reader*/, ModifierData *md) } ModifierTypeInfo modifierType_MeshSequenceCache = { - /* name */ N_("MeshSequenceCache"), - /* structName */ "MeshSeqCacheModifierData", - /* structSize */ sizeof(MeshSeqCacheModifierData), - /* srna */ &RNA_MeshSequenceCacheModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ + /*name*/ N_("MeshSequenceCache"), + /*structName*/ "MeshSeqCacheModifierData", + /*structSize*/ sizeof(MeshSeqCacheModifierData), + /*srna*/ &RNA_MeshSequenceCacheModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ static_cast(eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs), - /* icon */ ICON_MOD_MESHDEFORM, /* TODO: Use correct icon. */ + /*icon*/ ICON_MOD_MESHDEFORM, /* TODO: Use correct icon. */ - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc index ca65afb7176..b971f98ad95 100644 --- a/source/blender/modifiers/intern/MOD_mirror.cc +++ b/source/blender/modifiers/intern/MOD_mirror.cc @@ -196,38 +196,38 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Mirror = { - /* name */ N_("Mirror"), - /* structName */ "MirrorModifierData", - /* structSize */ sizeof(MirrorModifierData), - /* srna */ &RNA_MirrorModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("Mirror"), + /*structName*/ "MirrorModifierData", + /*structSize*/ sizeof(MirrorModifierData), + /*srna*/ &RNA_MirrorModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs | /* this is only the case when 'MOD_MIR_VGROUP' is used */ eModifierTypeFlag_UsesPreview, - /* icon */ ICON_MOD_MIRROR, + /*icon*/ ICON_MOD_MIRROR, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc index 737999e6b88..c65774fd5ff 100644 --- a/source/blender/modifiers/intern/MOD_multires.cc +++ b/source/blender/modifiers/intern/MOD_multires.cc @@ -487,35 +487,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Multires = { - /* name */ N_("Multires"), - /* structName */ "MultiresModifierData", - /* structSize */ sizeof(MultiresModifierData), - /* srna */ &RNA_MultiresModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("Multires"), + /*structName*/ "MultiresModifierData", + /*structSize*/ sizeof(MultiresModifierData), + /*srna*/ &RNA_MultiresModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_RequiresOriginalData, - /* icon */ ICON_MOD_MULTIRES, + /*icon*/ ICON_MOD_MULTIRES, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ nullptr, - /* deformMatrices */ deformMatrices, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ deformMatrices, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ nullptr, - /* updateDepsgraph */ nullptr, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ nullptr, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ freeRuntimeData, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ nullptr, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ nullptr, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ freeRuntimeData, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index d9198ba9025..1261cf56b26 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1907,38 +1907,38 @@ static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks *r_cdda } ModifierTypeInfo modifierType_Nodes = { - /* name */ N_("GeometryNodes"), - /* structName */ "NodesModifierData", - /* structSize */ sizeof(NodesModifierData), - /* srna */ &RNA_NodesModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ + /*name*/ N_("GeometryNodes"), + /*structName*/ "NodesModifierData", + /*structSize*/ sizeof(NodesModifierData), + /*srna*/ &RNA_NodesModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ static_cast(eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_SupportsMapping), - /* icon */ ICON_GEOMETRY_NODES, + /*icon*/ ICON_GEOMETRY_NODES, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ modifyGeometrySet, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ modifyGeometrySet, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_none.c b/source/blender/modifiers/intern/MOD_none.c index 7e1a1b84d01..1cadeadda98 100644 --- a/source/blender/modifiers/intern/MOD_none.c +++ b/source/blender/modifiers/intern/MOD_none.c @@ -28,34 +28,34 @@ static bool isDisabled(const struct Scene *UNUSED(scene), } ModifierTypeInfo modifierType_None = { - /* name */ "None", - /* structName */ "ModifierData", - /* structSize */ sizeof(ModifierData), - /* srna */ &RNA_Modifier, - /* type */ eModifierTypeType_None, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_NONE, + /*name*/ "None", + /*structName*/ "ModifierData", + /*structSize*/ sizeof(ModifierData), + /*srna*/ &RNA_Modifier, + /*type*/ eModifierTypeType_None, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs, + /*icon*/ ICON_NONE, - /* copyData */ NULL, + /*copyData*/ NULL, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ NULL, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ NULL, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ NULL, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ NULL, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc index 0bf1a268577..d6089372da6 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.cc +++ b/source/blender/modifiers/intern/MOD_normal_edit.cc @@ -786,35 +786,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_NormalEdit = { - /* name */ N_("NormalEdit"), - /* structName */ "NormalEditModifierData", - /* structSize */ sizeof(NormalEditModifierData), - /* srna */ &RNA_NormalEditModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("NormalEdit"), + /*structName*/ "NormalEditModifierData", + /*structSize*/ sizeof(NormalEditModifierData), + /*srna*/ &RNA_NormalEditModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_NORMALEDIT, + /*icon*/ ICON_MOD_NORMALEDIT, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 4aa896707dd..64a2efc5459 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -698,35 +698,35 @@ static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) } ModifierTypeInfo modifierType_Ocean = { - /* name */ N_("Ocean"), - /* structName */ "OceanModifierData", - /* structSize */ sizeof(OceanModifierData), - /* srna */ &RNA_OceanModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | + /*name*/ N_("Ocean"), + /*structName*/ "OceanModifierData", + /*structSize*/ sizeof(OceanModifierData), + /*srna*/ &RNA_OceanModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_OCEAN, + /*icon*/ ICON_MOD_OCEAN, - /* copyData */ copyData, - /* deformMatrices_DM */ NULL, + /*copyData*/ copyData, + /*deformMatrices_DM*/ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index e3682acf84a..7b9c5d3e657 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -633,35 +633,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_ParticleInstance = { - /* name */ N_("ParticleInstance"), - /* structName */ "ParticleInstanceModifierData", - /* structSize */ sizeof(ParticleInstanceModifierData), - /* srna */ &RNA_ParticleInstanceModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("ParticleInstance"), + /*structName*/ "ParticleInstanceModifierData", + /*structSize*/ sizeof(ParticleInstanceModifierData), + /*srna*/ &RNA_ParticleInstanceModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_PARTICLE_INSTANCE, + /*icon*/ ICON_MOD_PARTICLE_INSTANCE, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index 66291520176..bf19553378f 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -298,39 +298,39 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_ParticleSystem = { - /* name */ N_("ParticleSystem"), - /* structName */ "ParticleSystemModifierData", - /* structSize */ sizeof(ParticleSystemModifierData), - /* srna */ &RNA_ParticleSystemModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("ParticleSystem"), + /*structName*/ "ParticleSystemModifierData", + /*structSize*/ sizeof(ParticleSystemModifierData), + /*srna*/ &RNA_ParticleSystemModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_UsesPointCache #if 0 | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode #endif , - /* icon */ ICON_MOD_PARTICLES, + /*icon*/ ICON_MOD_PARTICLES, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ nullptr, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ nullptr, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ nullptr, - /* updateDepsgraph */ nullptr, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ nullptr, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ nullptr, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ nullptr, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 220b9e87aff..2a322571dbe 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -272,35 +272,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Remesh = { - /* name */ N_("Remesh"), - /* structName */ "RemeshModifierData", - /* structSize */ sizeof(RemeshModifierData), - /* srna */ &RNA_RemeshModifier, - /* type */ eModifierTypeType_Nonconstructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*name*/ N_("Remesh"), + /*structName*/ "RemeshModifierData", + /*structSize*/ sizeof(RemeshModifierData), + /*srna*/ &RNA_RemeshModifier, + /*type*/ eModifierTypeType_Nonconstructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_REMESH, + /*icon*/ ICON_MOD_REMESH, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc index 0f094f06bd0..0b3514dcadd 100644 --- a/source/blender/modifiers/intern/MOD_screw.cc +++ b/source/blender/modifiers/intern/MOD_screw.cc @@ -1104,36 +1104,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Screw = { - /* name */ N_("Screw"), - /* structName */ "ScrewModifierData", - /* structSize */ sizeof(ScrewModifierData), - /* srna */ &RNA_ScrewModifier, - /* type */ eModifierTypeType_Constructive, + /*name*/ N_("Screw"), + /*structName*/ "ScrewModifierData", + /*structSize*/ sizeof(ScrewModifierData), + /*srna*/ &RNA_ScrewModifier, + /*type*/ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_SCREW, + /*icon*/ ICON_MOD_SCREW, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 3649a108ed4..c4993575afe 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -109,35 +109,35 @@ static void deformMatricesEM(ModifierData *UNUSED(md), } ModifierTypeInfo modifierType_ShapeKey = { - /* name */ N_("ShapeKey"), - /* structName */ "ShapeKeyModifierData", - /* structSize */ sizeof(ShapeKeyModifierData), - /* srna */ &RNA_Modifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("ShapeKey"), + /*structName*/ "ShapeKeyModifierData", + /*structSize*/ sizeof(ShapeKeyModifierData), + /*srna*/ &RNA_Modifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_DOT, + /*icon*/ ICON_DOT, - /* copyData */ NULL, + /*copyData*/ NULL, - /* deformVerts */ deformVerts, - /* deformMatrices */ deformMatrices, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ deformMatricesEM, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ deformMatrices, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ deformMatricesEM, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ NULL, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ NULL, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ NULL, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ NULL, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index b5e66a1af79..8f63be85507 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -251,36 +251,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Shrinkwrap = { - /* name */ N_("Shrinkwrap"), - /* structName */ "ShrinkwrapModifierData", - /* structSize */ sizeof(ShrinkwrapModifierData), - /* srna */ &RNA_ShrinkwrapModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*name*/ N_("Shrinkwrap"), + /*structName*/ "ShrinkwrapModifierData", + /*structSize*/ sizeof(ShrinkwrapModifierData), + /*srna*/ &RNA_ShrinkwrapModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_SHRINKWRAP, + /*icon*/ ICON_MOD_SHRINKWRAP, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index c08853d06a7..296cc2a4d44 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -559,37 +559,37 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_SimpleDeform = { - /* name */ N_("SimpleDeform"), - /* structName */ "SimpleDeformModifierData", - /* structSize */ sizeof(SimpleDeformModifierData), - /* srna */ &RNA_SimpleDeformModifier, - /* type */ eModifierTypeType_OnlyDeform, + /*name*/ N_("SimpleDeform"), + /*structName*/ "SimpleDeformModifierData", + /*structSize*/ sizeof(SimpleDeformModifierData), + /*srna*/ &RNA_SimpleDeformModifier, + /*type*/ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_SIMPLEDEFORM, + /*icon*/ ICON_MOD_SIMPLEDEFORM, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index efb8ae8616a..fa348dcb15e 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -2076,34 +2076,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Skin = { - /* name */ N_("Skin"), - /* structName */ "SkinModifierData", - /* structSize */ sizeof(SkinModifierData), - /* srna */ &RNA_SkinModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_SKIN, + /*name*/ N_("Skin"), + /*structName*/ "SkinModifierData", + /*structSize*/ sizeof(SkinModifierData), + /*srna*/ &RNA_SkinModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_SKIN, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 72fc945675c..32cb29bcf52 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -251,35 +251,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Smooth = { - /* name */ N_("Smooth"), - /* structName */ "SmoothModifierData", - /* structSize */ sizeof(SmoothModifierData), - /* srna */ &RNA_SmoothModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*name*/ N_("Smooth"), + /*structName*/ "SmoothModifierData", + /*structSize*/ sizeof(SmoothModifierData), + /*srna*/ &RNA_SmoothModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_SMOOTH, + /*icon*/ ICON_MOD_SMOOTH, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index ecff6d80893..9437c51534d 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -86,36 +86,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Softbody = { - /* name */ N_("Softbody"), - /* structName */ "SoftbodyModifierData", - /* structSize */ sizeof(SoftbodyModifierData), - /* srna */ &RNA_SoftBodyModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Softbody"), + /*structName*/ "SoftbodyModifierData", + /*structSize*/ sizeof(SoftbodyModifierData), + /*srna*/ &RNA_SoftBodyModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_RequiresOriginalData | eModifierTypeFlag_Single | eModifierTypeFlag_UsesPointCache, - /* icon */ ICON_MOD_SOFT, + /*icon*/ ICON_MOD_SOFT, - /* copyData */ NULL, + /*copyData*/ NULL, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ NULL, - /* requiredDataMask */ NULL, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ NULL, + /*requiredDataMask*/ NULL, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 1c1649a5ed8..b13f36ee47d 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -246,37 +246,37 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Solidify = { - /* name */ N_("Solidify"), - /* structName */ "SolidifyModifierData", - /* structSize */ sizeof(SolidifyModifierData), - /* srna */ &RNA_SolidifyModifier, - /* type */ eModifierTypeType_Constructive, + /*name*/ N_("Solidify"), + /*structName*/ "SolidifyModifierData", + /*structSize*/ sizeof(SolidifyModifierData), + /*srna*/ &RNA_SolidifyModifier, + /*type*/ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_SOLIDIFY, + /*icon*/ ICON_MOD_SOLIDIFY, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index 23989e7640c..75377f00bb3 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -471,36 +471,36 @@ static void blendRead(BlendDataReader * /*reader*/, ModifierData *md) } ModifierTypeInfo modifierType_Subsurf = { - /* name */ N_("Subdivision"), - /* structName */ "SubsurfModifierData", - /* structSize */ sizeof(SubsurfModifierData), - /* srna */ &RNA_SubsurfModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("Subdivision"), + /*structName*/ "SubsurfModifierData", + /*structSize*/ sizeof(SubsurfModifierData), + /*srna*/ &RNA_SubsurfModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_MOD_SUBSURF, + /*icon*/ ICON_MOD_SUBSURF, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ nullptr, - /* deformMatrices */ deformMatrices, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ deformMatrices, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ nullptr, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ nullptr, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ freeRuntimeData, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ nullptr, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ nullptr, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ freeRuntimeData, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 00fe739b49c..b48bd20e821 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -204,35 +204,35 @@ static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) } ModifierTypeInfo modifierType_Surface = { - /* name */ N_("Surface"), - /* structName */ "SurfaceModifierData", - /* structSize */ sizeof(SurfaceModifierData), - /* srna */ &RNA_SurfaceModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | + /*name*/ N_("Surface"), + /*structName*/ "SurfaceModifierData", + /*structSize*/ sizeof(SurfaceModifierData), + /*srna*/ &RNA_SurfaceModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_NoUserAdd, - /* icon */ ICON_MOD_PHYSICS, + /*icon*/ ICON_MOD_PHYSICS, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ NULL, - /* freeData */ freeData, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ NULL, + /*freeData*/ freeData, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 000d44abd99..c43bf19a580 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1743,34 +1743,34 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_SurfaceDeform = { - /* name */ N_("SurfaceDeform"), - /* structName */ "SurfaceDeformModifierData", - /* structSize */ sizeof(SurfaceDeformModifierData), - /* srna */ &RNA_SurfaceDeformModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_MESHDEFORM, + /*name*/ N_("SurfaceDeform"), + /*structName*/ "SurfaceDeformModifierData", + /*structSize*/ sizeof(SurfaceDeformModifierData), + /*srna*/ &RNA_SurfaceDeformModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_MESHDEFORM, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_triangulate.cc b/source/blender/modifiers/intern/MOD_triangulate.cc index 3880bd8a233..adcf76a949d 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.cc +++ b/source/blender/modifiers/intern/MOD_triangulate.cc @@ -143,36 +143,36 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Triangulate = { - /* name */ N_("Triangulate"), - /* structName */ "TriangulateModifierData", - /* structSize */ sizeof(TriangulateModifierData), - /* srna */ &RNA_TriangulateModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | + /*name*/ N_("Triangulate"), + /*structName*/ "TriangulateModifierData", + /*structSize*/ sizeof(TriangulateModifierData), + /*srna*/ &RNA_TriangulateModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs, - /* icon */ ICON_MOD_TRIANGULATE, + /*icon*/ ICON_MOD_TRIANGULATE, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ nullptr, // requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ nullptr, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ nullptr, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, // requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ nullptr, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ nullptr, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc index 1d660a05c44..9491a6bfb6e 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.cc +++ b/source/blender/modifiers/intern/MOD_uvproject.cc @@ -346,35 +346,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_UVProject = { - /* name */ N_("UVProject"), - /* structName */ "UVProjectModifierData", - /* structSize */ sizeof(UVProjectModifierData), - /* srna */ &RNA_UVProjectModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("UVProject"), + /*structName*/ "UVProjectModifierData", + /*structSize*/ sizeof(UVProjectModifierData), + /*srna*/ &RNA_UVProjectModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_UVPROJECT, + /*icon*/ ICON_MOD_UVPROJECT, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index 2c11b002fc5..5b4f3275d58 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -303,35 +303,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_UVWarp = { - /* name */ N_("UVWarp"), - /* structName */ "UVWarpModifierData", - /* structSize */ sizeof(UVWarpModifierData), - /* srna */ &RNA_UVWarpModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | + /*name*/ N_("UVWarp"), + /*structName*/ "UVWarpModifierData", + /*structSize*/ sizeof(UVWarpModifierData), + /*srna*/ &RNA_UVWarpModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_UVPROJECT, /* TODO: Use correct icon. */ + /*icon*/ ICON_MOD_UVPROJECT, /* TODO: Use correct icon. */ - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index 2d6f8c100e7..33ef740977e 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -310,34 +310,34 @@ static void modifyGeometrySet(ModifierData *md, } ModifierTypeInfo modifierType_VolumeDisplace = { - /* name */ N_("Volume Displace"), - /* structName */ "VolumeDisplaceModifierData", - /* structSize */ sizeof(VolumeDisplaceModifierData), - /* srna */ &RNA_VolumeDisplaceModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ static_cast(0), - /* icon */ ICON_VOLUME_DATA, /* TODO: Use correct icon. */ + /*name*/ N_("Volume Displace"), + /*structName*/ "VolumeDisplaceModifierData", + /*structSize*/ sizeof(VolumeDisplaceModifierData), + /*srna*/ &RNA_VolumeDisplaceModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ static_cast(0), + /*icon*/ ICON_VOLUME_DATA, /* TODO: Use correct icon. */ - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ nullptr, - /* modifyGeometrySet */ modifyGeometrySet, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ nullptr, + /*modifyGeometrySet*/ modifyGeometrySet, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc index 2a8883dc2eb..cefeb6509db 100644 --- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc +++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc @@ -195,34 +195,34 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * } ModifierTypeInfo modifierType_VolumeToMesh = { - /* name */ N_("Volume to Mesh"), - /* structName */ "VolumeToMeshModifierData", - /* structSize */ sizeof(VolumeToMeshModifierData), - /* srna */ &RNA_VolumeToMeshModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh, - /* icon */ ICON_VOLUME_DATA, /* TODO: Use correct icon. */ + /*name*/ N_("Volume to Mesh"), + /*structName*/ "VolumeToMeshModifierData", + /*structSize*/ sizeof(VolumeToMeshModifierData), + /*srna*/ &RNA_VolumeToMeshModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh, + /*icon*/ ICON_VOLUME_DATA, /* TODO: Use correct icon. */ - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ nullptr, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ nullptr, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 791eed28a71..2dfdd842a0c 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -508,34 +508,34 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_Warp = { - /* name */ N_("Warp"), - /* structName */ "WarpModifierData", - /* structSize */ sizeof(WarpModifierData), - /* srna */ &RNA_WarpModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Warp"), + /*structName*/ "WarpModifierData", + /*structSize*/ sizeof(WarpModifierData), + /*srna*/ &RNA_WarpModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_WARP, - /* copyData */ copyData, + /*icon*/ ICON_MOD_WARP, + /*copyData*/ copyData, - /* deformVerts */ deformVerts, - /* deformMatrices */ NULL, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ NULL, - /* modifyMesh */ NULL, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ NULL, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ NULL, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index dce006bda92..2eaaa78aee8 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -464,35 +464,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Wave = { - /* name */ N_("Wave"), - /* structName */ "WaveModifierData", - /* structSize */ sizeof(WaveModifierData), - /* srna */ &RNA_WaveModifier, - /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | + /*name*/ N_("Wave"), + /*structName*/ "WaveModifierData", + /*structSize*/ sizeof(WaveModifierData), + /*srna*/ &RNA_WaveModifier, + /*type*/ eModifierTypeType_OnlyDeform, + /*flags*/ eModifierTypeFlag_AcceptsCVs | eModifierTypeFlag_AcceptsVertexCosOnly | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_WAVE, + /*icon*/ ICON_MOD_WAVE, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ deformVerts, - /* deformMatrices */ nullptr, - /* deformVertsEM */ deformVertsEM, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ nullptr, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ deformVerts, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ deformVertsEM, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ nullptr, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc index f8f84fcd735..cbf385d20a7 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.cc +++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc @@ -745,35 +745,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_WeightedNormal = { - /* name */ N_("WeightedNormal"), - /* structName */ "WeightedNormalModifierData", - /* structSize */ sizeof(WeightedNormalModifierData), - /* srna */ &RNA_WeightedNormalModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("WeightedNormal"), + /*structName*/ "WeightedNormalModifierData", + /*structSize*/ sizeof(WeightedNormalModifierData), + /*srna*/ &RNA_WeightedNormalModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode, - /* icon */ ICON_MOD_NORMALEDIT, + /*icon*/ ICON_MOD_NORMALEDIT, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ nullptr, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ nullptr, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ nullptr, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ nullptr, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc index e4fbca633f7..e8a2795aa79 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.cc +++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc @@ -388,35 +388,35 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_WeightVGEdit = { - /* name */ N_("VertexWeightEdit"), - /* structName */ "WeightVGEditModifierData", - /* structSize */ sizeof(WeightVGEditModifierData), - /* srna */ &RNA_VertexWeightEditModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("VertexWeightEdit"), + /*structName*/ "WeightVGEditModifierData", + /*structSize*/ sizeof(WeightVGEditModifierData), + /*srna*/ &RNA_VertexWeightEditModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_UsesPreview, - /* icon */ ICON_MOD_VERTEX_WEIGHT, + /*icon*/ ICON_MOD_VERTEX_WEIGHT, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc index d860e93d535..c766d117db8 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.cc +++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc @@ -490,35 +490,35 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_WeightVGMix = { - /* name */ N_("VertexWeightMix"), - /* structName */ "WeightVGMixModifierData", - /* structSize */ sizeof(WeightVGMixModifierData), - /* srna */ &RNA_VertexWeightMixModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("VertexWeightMix"), + /*structName*/ "WeightVGMixModifierData", + /*structSize*/ sizeof(WeightVGMixModifierData), + /*srna*/ &RNA_VertexWeightMixModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_UsesPreview, - /* icon */ ICON_MOD_VERTEX_WEIGHT, + /*icon*/ ICON_MOD_VERTEX_WEIGHT, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc index e4e03a2cbc9..917311f68d1 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc @@ -736,35 +736,35 @@ static void blendRead(BlendDataReader *reader, ModifierData *md) } ModifierTypeInfo modifierType_WeightVGProximity = { - /* name */ N_("VertexWeightProximity"), - /* structName */ "WeightVGProximityModifierData", - /* structSize */ sizeof(WeightVGProximityModifierData), - /* srna */ &RNA_VertexWeightProximityModifier, - /* type */ eModifierTypeType_NonGeometrical, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | + /*name*/ N_("VertexWeightProximity"), + /*structName*/ "WeightVGProximityModifierData", + /*structSize*/ sizeof(WeightVGProximityModifierData), + /*srna*/ &RNA_VertexWeightProximityModifier, + /*type*/ eModifierTypeType_NonGeometrical, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_UsesPreview, - /* icon */ ICON_MOD_VERTEX_WEIGHT, + /*icon*/ ICON_MOD_VERTEX_WEIGHT, - /* copyData */ copyData, + /*copyData*/ copyData, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ freeData, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ dependsOnTime, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ foreachTexLink, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ blendWrite, - /* blendRead */ blendRead, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ freeData, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ dependsOnTime, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ foreachIDLink, + /*foreachTexLink*/ foreachTexLink, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ blendWrite, + /*blendRead*/ blendRead, }; diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc index dc9d361c838..7460110c5ae 100644 --- a/source/blender/modifiers/intern/MOD_weld.cc +++ b/source/blender/modifiers/intern/MOD_weld.cc @@ -179,37 +179,37 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Weld = { - /* name */ N_("Weld"), - /* structName */ "WeldModifierData", - /* structSize */ sizeof(WeldModifierData), - /* srna */ &RNA_WeldModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ + /*name*/ N_("Weld"), + /*structName*/ "WeldModifierData", + /*structSize*/ sizeof(WeldModifierData), + /*srna*/ &RNA_WeldModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ (ModifierTypeFlag)(eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs), - /* icon */ ICON_AUTOMERGE_OFF, /* TODO: Use correct icon. */ + /*icon*/ ICON_AUTOMERGE_OFF, /* TODO: Use correct icon. */ - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ nullptr, - /* deformMatrices */ nullptr, - /* deformVertsEM */ nullptr, - /* deformMatricesEM */ nullptr, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ nullptr, + /*deformVerts*/ nullptr, + /*deformMatrices*/ nullptr, + /*deformVertsEM*/ nullptr, + /*deformMatricesEM*/ nullptr, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ nullptr, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ nullptr, - /* isDisabled */ nullptr, - /* updateDepsgraph */ nullptr, - /* dependsOnTime */ nullptr, - /* dependsOnNormals */ nullptr, - /* foreachIDLink */ nullptr, - /* foreachTexLink */ nullptr, - /* freeRuntimeData */ nullptr, - /* panelRegister */ panelRegister, - /* blendWrite */ nullptr, - /* blendRead */ nullptr, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ nullptr, + /*isDisabled*/ nullptr, + /*updateDepsgraph*/ nullptr, + /*dependsOnTime*/ nullptr, + /*dependsOnNormals*/ nullptr, + /*foreachIDLink*/ nullptr, + /*foreachTexLink*/ nullptr, + /*freeRuntimeData*/ nullptr, + /*panelRegister*/ panelRegister, + /*blendWrite*/ nullptr, + /*blendRead*/ nullptr, }; diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index 85696bed162..8339e1cea76 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -163,34 +163,34 @@ static void panelRegister(ARegionType *region_type) } ModifierTypeInfo modifierType_Wireframe = { - /* name */ N_("Wireframe"), - /* structName */ "WireframeModifierData", - /* structSize */ sizeof(WireframeModifierData), - /* srna */ &RNA_WireframeModifier, - /* type */ eModifierTypeType_Constructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* icon */ ICON_MOD_WIREFRAME, + /*name*/ N_("Wireframe"), + /*structName*/ "WireframeModifierData", + /*structSize*/ sizeof(WireframeModifierData), + /*srna*/ &RNA_WireframeModifier, + /*type*/ eModifierTypeType_Constructive, + /*flags*/ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /*icon*/ ICON_MOD_WIREFRAME, - /* copyData */ BKE_modifier_copydata_generic, + /*copyData*/ BKE_modifier_copydata_generic, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, - /* modifyMesh */ modifyMesh, - /* modifyGeometrySet */ NULL, + /*deformVerts*/ NULL, + /*deformMatrices*/ NULL, + /*deformVertsEM*/ NULL, + /*deformMatricesEM*/ NULL, + /*modifyMesh*/ modifyMesh, + /*modifyGeometrySet*/ NULL, - /* initData */ initData, - /* requiredDataMask */ requiredDataMask, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepgraph */ NULL, - /* dependsOnTime */ NULL, - /* dependsOnNormals */ dependsOnNormals, - /* foreachIDLink */ NULL, - /* foreachTexLink */ NULL, - /* freeRuntimeData */ NULL, - /* panelRegister */ panelRegister, - /* blendWrite */ NULL, - /* blendRead */ NULL, + /*initData*/ initData, + /*requiredDataMask*/ requiredDataMask, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*dependsOnNormals*/ dependsOnNormals, + /*foreachIDLink*/ NULL, + /*foreachTexLink*/ NULL, + /*freeRuntimeData*/ NULL, + /*panelRegister*/ panelRegister, + /*blendWrite*/ NULL, + /*blendRead*/ NULL, }; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index c61cab5aa6f..1e338ca03b3 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -3378,7 +3378,7 @@ static PySequenceMethods pyrna_prop_array_as_sequence = { /*sq_item*/ (ssizeargfunc)pyrna_prop_array_subscript_int, /*sq_slice*/ NULL, /*sq_ass_item*/ (ssizeobjargproc)prop_subscript_ass_array_int, - /* was_sq_ass_slice */ NULL, /* DEPRECATED. */ + /*was_sq_ass_slice*/ NULL, /* DEPRECATED. */ /*sq_contains*/ (objobjproc)pyrna_prop_array_contains, /*sq_inplace_concat*/ NULL, /*sq_inplace_repeat*/ NULL, diff --git a/source/blender/sequencer/intern/modifier.c b/source/blender/sequencer/intern/modifier.c index a962bcdbd06..150b72e8e87 100644 --- a/source/blender/sequencer/intern/modifier.c +++ b/source/blender/sequencer/intern/modifier.c @@ -626,13 +626,13 @@ static void colorBalance_apply(SequenceModifierData *smd, ImBuf *ibuf, ImBuf *ma } static SequenceModifierTypeInfo seqModifier_ColorBalance = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Color Balance"), /* name */ - "ColorBalanceModifierData", /* struct_name */ - sizeof(ColorBalanceModifierData), /* struct_size */ - colorBalance_init_data, /* init_data */ - NULL, /* free_data */ - NULL, /* copy_data */ - colorBalance_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Color Balance"), + /*struct_name*/ "ColorBalanceModifierData", + /*struct_size*/ sizeof(ColorBalanceModifierData), + /*init_data*/ colorBalance_init_data, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*apply*/ colorBalance_apply, }; /** \} */ @@ -722,13 +722,13 @@ static void whiteBalance_apply(SequenceModifierData *smd, ImBuf *ibuf, ImBuf *ma } static SequenceModifierTypeInfo seqModifier_WhiteBalance = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "White Balance"), /* name */ - "WhiteBalanceModifierData", /* struct_name */ - sizeof(WhiteBalanceModifierData), /* struct_size */ - whiteBalance_init_data, /* init_data */ - NULL, /* free_data */ - NULL, /* copy_data */ - whiteBalance_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "White Balance"), + /*struct_name*/ "WhiteBalanceModifierData", + /*struct_size*/ sizeof(WhiteBalanceModifierData), + /*init_data*/ whiteBalance_init_data, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*apply*/ whiteBalance_apply, }; /** \} */ @@ -840,13 +840,13 @@ static void curves_apply(struct SequenceModifierData *smd, ImBuf *ibuf, ImBuf *m } static SequenceModifierTypeInfo seqModifier_Curves = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Curves"), /* name */ - "CurvesModifierData", /* struct_name */ - sizeof(CurvesModifierData), /* struct_size */ - curves_init_data, /* init_data */ - curves_free_data, /* free_data */ - curves_copy_data, /* copy_data */ - curves_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Curves"), + /*struct_name*/ "CurvesModifierData", + /*struct_size*/ sizeof(CurvesModifierData), + /*init_data*/ curves_init_data, + /*free_data*/ curves_free_data, + /*copy_data*/ curves_copy_data, + /*apply*/ curves_apply, }; /** \} */ @@ -964,13 +964,13 @@ static void hue_correct_apply(struct SequenceModifierData *smd, ImBuf *ibuf, ImB } static SequenceModifierTypeInfo seqModifier_HueCorrect = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Hue Correct"), /* name */ - "HueCorrectModifierData", /* struct_name */ - sizeof(HueCorrectModifierData), /* struct_size */ - hue_correct_init_data, /* init_data */ - hue_correct_free_data, /* free_data */ - hue_correct_copy_data, /* copy_data */ - hue_correct_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Hue Correct"), + /*struct_name*/ "HueCorrectModifierData", + /*struct_size*/ sizeof(HueCorrectModifierData), + /*init_data*/ hue_correct_init_data, + /*free_data*/ hue_correct_free_data, + /*copy_data*/ hue_correct_copy_data, + /*apply*/ hue_correct_apply, }; /** \} */ @@ -1071,13 +1071,13 @@ static void brightcontrast_apply(struct SequenceModifierData *smd, ImBuf *ibuf, } static SequenceModifierTypeInfo seqModifier_BrightContrast = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Bright/Contrast"), /* name */ - "BrightContrastModifierData", /* struct_name */ - sizeof(BrightContrastModifierData), /* struct_size */ - NULL, /* init_data */ - NULL, /* free_data */ - NULL, /* copy_data */ - brightcontrast_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Bright/Contrast"), + /*struct_name*/ "BrightContrastModifierData", + /*struct_size*/ sizeof(BrightContrastModifierData), + /*init_data*/ NULL, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*apply*/ brightcontrast_apply, }; /** \} */ @@ -1145,13 +1145,13 @@ static void maskmodifier_apply(struct SequenceModifierData *UNUSED(smd), ImBuf * } static SequenceModifierTypeInfo seqModifier_Mask = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Mask"), /* name */ - "SequencerMaskModifierData", /* struct_name */ - sizeof(SequencerMaskModifierData), /* struct_size */ - NULL, /* init_data */ - NULL, /* free_data */ - NULL, /* copy_data */ - maskmodifier_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Mask"), + /*struct_name*/ "SequencerMaskModifierData", + /*struct_size*/ sizeof(SequencerMaskModifierData), + /*init_data*/ NULL, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*apply*/ maskmodifier_apply, }; /** \} */ @@ -1361,13 +1361,13 @@ static void tonemapmodifier_apply(struct SequenceModifierData *smd, ImBuf *ibuf, } static SequenceModifierTypeInfo seqModifier_Tonemap = { - CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Tonemap"), /* name */ - "SequencerTonemapModifierData", /* struct_name */ - sizeof(SequencerTonemapModifierData), /* struct_size */ - tonemapmodifier_init_data, /* init_data */ - NULL, /* free_data */ - NULL, /* copy_data */ - tonemapmodifier_apply, /* apply */ + /*name*/ CTX_N_(BLT_I18NCONTEXT_ID_SEQUENCE, "Tonemap"), + /*struct_name*/ "SequencerTonemapModifierData", + /*struct_size*/ sizeof(SequencerTonemapModifierData), + /*init_data*/ tonemapmodifier_init_data, + /*free_data*/ NULL, + /*copy_data*/ NULL, + /*apply*/ tonemapmodifier_apply, }; /** \} */ diff --git a/source/blender/shader_fx/intern/FX_shader_blur.c b/source/blender/shader_fx/intern/FX_shader_blur.c index 14e9a647105..8bc7b069c6e 100644 --- a/source/blender/shader_fx/intern/FX_shader_blur.c +++ b/source/blender/shader_fx/intern/FX_shader_blur.c @@ -64,19 +64,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Blur = { - /* name */ N_("Blur"), - /* structName */ "BlurShaderFxData", - /* structSize */ sizeof(BlurShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Blur"), + /*structName*/ "BlurShaderFxData", + /*structSize*/ sizeof(BlurShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.c b/source/blender/shader_fx/intern/FX_shader_colorize.c index 5551b16f445..bd36804a61a 100644 --- a/source/blender/shader_fx/intern/FX_shader_colorize.c +++ b/source/blender/shader_fx/intern/FX_shader_colorize.c @@ -71,19 +71,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Colorize = { - /* name */ N_("Colorize"), - /* structName */ "ColorizeShaderFxData", - /* structSize */ sizeof(ColorizeShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Colorize"), + /*structName*/ "ColorizeShaderFxData", + /*structSize*/ sizeof(ColorizeShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c index 5b5c12205ca..7d067bbc6f8 100644 --- a/source/blender/shader_fx/intern/FX_shader_flip.c +++ b/source/blender/shader_fx/intern/FX_shader_flip.c @@ -61,19 +61,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Flip = { - /* name */ N_("Flip"), - /* structName */ "FlipShaderFxData", - /* structSize */ sizeof(FlipShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Flip"), + /*structName*/ "FlipShaderFxData", + /*structSize*/ sizeof(FlipShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c index b620754225a..9c0e5857f6c 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.c +++ b/source/blender/shader_fx/intern/FX_shader_glow.c @@ -82,19 +82,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Glow = { - /* name */ N_("Glow"), - /* structName */ "GlowShaderFxData", - /* structSize */ sizeof(GlowShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Glow"), + /*structName*/ "GlowShaderFxData", + /*structSize*/ sizeof(GlowShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.c b/source/blender/shader_fx/intern/FX_shader_pixel.c index 6f43bfb32b7..ed7cf14dde9 100644 --- a/source/blender/shader_fx/intern/FX_shader_pixel.c +++ b/source/blender/shader_fx/intern/FX_shader_pixel.c @@ -62,19 +62,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Pixel = { - /* name */ N_("Pixelate"), - /* structName */ "PixelShaderFxData", - /* structSize */ sizeof(PixelShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Pixelate"), + /*structName*/ "PixelShaderFxData", + /*structSize*/ sizeof(PixelShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_rim.c b/source/blender/shader_fx/intern/FX_shader_rim.c index d314724eaca..76aae8302cd 100644 --- a/source/blender/shader_fx/intern/FX_shader_rim.c +++ b/source/blender/shader_fx/intern/FX_shader_rim.c @@ -89,19 +89,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Rim = { - /* name */ N_("Rim"), - /* structName */ "RimShaderFxData", - /* structSize */ sizeof(RimShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Rim"), + /*structName*/ "RimShaderFxData", + /*structSize*/ sizeof(RimShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c index 4b8b44cc5b0..cbbe182e7fa 100644 --- a/source/blender/shader_fx/intern/FX_shader_shadow.c +++ b/source/blender/shader_fx/intern/FX_shader_shadow.c @@ -159,19 +159,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Shadow = { - /* name */ N_("Shadow"), - /* structName */ "ShadowShaderFxData", - /* structSize */ sizeof(ShadowShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Shadow"), + /*structName*/ "ShadowShaderFxData", + /*structSize*/ sizeof(ShadowShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.c b/source/blender/shader_fx/intern/FX_shader_swirl.c index 059fe0ca8b6..a02acb59c27 100644 --- a/source/blender/shader_fx/intern/FX_shader_swirl.c +++ b/source/blender/shader_fx/intern/FX_shader_swirl.c @@ -90,19 +90,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Swirl = { - /* name */ N_("Swirl"), - /* structName */ "SwirlShaderFxData", - /* structSize */ sizeof(SwirlShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("Swirl"), + /*structName*/ "SwirlShaderFxData", + /*structSize*/ sizeof(SwirlShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ updateDepsgraph, - /* dependsOnTime */ NULL, - /* foreachIDLink */ foreachIDLink, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ isDisabled, + /*updateDepsgraph*/ updateDepsgraph, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ foreachIDLink, + /*panelRegister*/ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_wave.c b/source/blender/shader_fx/intern/FX_shader_wave.c index 947bf58ec7c..ef5c626241c 100644 --- a/source/blender/shader_fx/intern/FX_shader_wave.c +++ b/source/blender/shader_fx/intern/FX_shader_wave.c @@ -63,19 +63,19 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Wave = { - /* name */ N_("WaveDistortion"), - /* structName */ "WaveShaderFxData", - /* structSize */ sizeof(WaveShaderFxData), - /* type */ eShaderFxType_GpencilType, - /* flags */ 0, + /*name*/ N_("WaveDistortion"), + /*structName*/ "WaveShaderFxData", + /*structSize*/ sizeof(WaveShaderFxData), + /*type*/ eShaderFxType_GpencilType, + /*flags*/ 0, - /* copyData */ copyData, + /*copyData*/ copyData, - /* initData */ initData, - /* freeData */ NULL, - /* isDisabled */ NULL, - /* updateDepsgraph */ NULL, - /* dependsOnTime */ NULL, - /* foreachIDLink */ NULL, - /* panelRegister */ panelRegister, + /*initData*/ initData, + /*freeData*/ NULL, + /*isDisabled*/ NULL, + /*updateDepsgraph*/ NULL, + /*dependsOnTime*/ NULL, + /*foreachIDLink*/ NULL, + /*panelRegister*/ panelRegister, };