diff options
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 27 | ||||
| -rw-r--r-- | source/blender/editors/object/object_constraint.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 35 | ||||
| -rw-r--r-- | source/blender/editors/object/object_facemap_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 34 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modes.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 24 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/object/object_remesh.cc | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_select.c | 31 | ||||
| -rw-r--r-- | source/blender/editors/object/object_shader_fx.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_utils.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 25 | ||||
| -rw-r--r-- | source/blender/editors/object/object_volume.c | 1 |
15 files changed, 54 insertions, 164 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index c77db10d74b..9354171a1e4 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -130,7 +130,7 @@ /** \name Local Enum Declarations * \{ */ -/* this is an exact copy of the define in rna_light.c +/* This is an exact copy of the define in `rna_light.c` * kept here because of linking order. * Icons are only defined here */ const EnumPropertyItem rna_enum_light_type_items[] = { @@ -331,8 +331,6 @@ void ED_object_base_init_transform_on_add(Object *object, const float loc[3], co BKE_object_to_mat4(object, object->obmat); } -/* Uses context to figure out transform for primitive. - * Returns standard diameter. */ float ED_object_new_primitive_matrix(bContext *C, Object *obedit, const float loc[3], @@ -603,12 +601,6 @@ bool ED_object_add_generic_get_opts(bContext *C, return true; } -/** - * For object add primitive operators, or for object creation when `obdata != NULL`. - * \param obdata: Assigned to #Object.data, with increased user count. - * - * \note Do not call undo push in this function (users of this function have to). - */ Object *ED_object_add_type_with_obdata(bContext *C, const int type, const char *name, @@ -1724,7 +1716,6 @@ static int object_instance_add_invoke(bContext *C, wmOperator *op, const wmEvent return op->type->exec(C, op); } -/* only used as menu */ void OBJECT_OT_collection_instance_add(wmOperatorType *ot) { PropertyRNA *prop; @@ -1994,8 +1985,7 @@ void OBJECT_OT_pointcloud_add(wmOperatorType *ot) /* -------------------------------------------------------------------- */ /** \name Delete Object Operator * \{ */ -/* remove base from a specific scene */ -/* NOTE: now unlinks constraints as well. */ + void ED_object_base_free_and_unlink(Main *bmain, Scene *scene, Object *ob) { if (ID_REAL_USERS(ob) <= 1 && ID_EXTRA_USERS(ob) == 0 && @@ -2013,10 +2003,6 @@ void ED_object_base_free_and_unlink(Main *bmain, Scene *scene, Object *ob) BKE_scene_collections_object_remove(bmain, scene, ob, true); } -/** - * Remove base from a specific scene. - * `ob` must not be indirectly used. - */ void ED_object_base_free_and_unlink_no_indirect_check(Main *bmain, Scene *scene, Object *ob) { BLI_assert(!BKE_library_ID_is_indirectly_used(bmain, ob)); @@ -3115,11 +3101,11 @@ static int object_convert_exec(bContext *C, wmOperator *op) basen = duplibase_for_convert(bmain, depsgraph, scene, view_layer, base, NULL); newob = basen->object; - /* Decrement original point-cloud's usage count. */ + /* Decrement original point cloud's usage count. */ PointCloud *pointcloud = newob->data; id_us_min(&pointcloud->id); - /* Make a new copy of the point-cloud. */ + /* Make a new copy of the point cloud. */ newob->data = BKE_id_copy(bmain, &pointcloud->id); } else { @@ -3371,11 +3357,6 @@ static Base *object_add_duplicate_internal(Main *bmain, return basen; } -/* single object duplicate, if dupflag==0, fully linked, else it uses the flags given */ -/* leaves selection of base/object unaltered. - * NOTE: don't call this within a loop since clear_* funcs loop over the entire database. - * NOTE: caller must do DAG_relations_tag_update(bmain); - * this is not done automatic since we may duplicate many objects in a batch */ Base *ED_object_add_duplicate( Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, const eDupli_ID_Flags dupflag) { diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 47c2998ed3d..5c3a8fc2277 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -80,10 +80,6 @@ /** \name Constraint Data Accessors * \{ */ -/** - * If object is in pose-mode, return active bone constraints, else object constraints. - * No constraints are returned for a bone on an inactive bone-layer. - */ ListBase *ED_object_constraint_active_list(Object *ob) { if (ob == NULL) { @@ -105,10 +101,6 @@ ListBase *ED_object_constraint_active_list(Object *ob) return NULL; } -/** - * Get the constraints for the active pose bone. Bone may be on an inactive bone-layer - * (unlike #ED_object_constraint_active_list, such constraints are not excluded here). - */ ListBase *ED_object_pose_constraint_list(const bContext *C) { bPoseChannel *pose_bone = CTX_data_pointer_get(C, "pose_bone").data; @@ -122,8 +114,6 @@ ListBase *ED_object_pose_constraint_list(const bContext *C) return &pose_bone->constraints; } -/* Find the list that a given constraint belongs to, - * and/or also get the posechannel this is from (if applicable) */ ListBase *ED_object_constraint_list_from_constraint(Object *ob, bConstraint *con, bPoseChannel **r_pchan) @@ -164,7 +154,6 @@ ListBase *ED_object_constraint_list_from_constraint(Object *ob, return NULL; } -/* single constraint */ bConstraint *ED_object_constraint_active_get(Object *ob) { return BKE_constraints_active_get(ED_object_constraint_active_list(ob)); diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 6251fb799c5..49149a5152f 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -603,7 +603,6 @@ static bool data_transfer_poll_property(const bContext *UNUSED(C), return true; } -/* Transfer mesh data from active to selected objects. */ void OBJECT_OT_data_transfer(wmOperatorType *ot) { PropertyRNA *prop; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 78440f52160..38d0a044cb4 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -134,8 +134,6 @@ Object *ED_object_context(const bContext *C) return CTX_data_pointer_get_type(C, "object", &RNA_Object).data; } -/* Find the correct active object per context. - * NOTE: context can be NULL when called from a enum with #PROP_ENUM_NO_CONTEXT. */ Object *ED_object_active_context(const bContext *C) { Object *ob = NULL; @@ -148,14 +146,6 @@ Object *ED_object_active_context(const bContext *C) return ob; } -/** - * Return an array of objects: - * - When in the property space, return the pinned or active object. - * - When in edit-mode/pose-mode, return an array of objects in the mode. - * - Otherwise return selected objects, - * the callers \a filter_fn needs to check of they are editable - * (assuming they need to be modified). - */ Object **ED_object_array_in_mode_or_selected(bContext *C, bool (*filter_fn)(const Object *ob, void *user_data), void *filter_user_data, @@ -669,10 +659,6 @@ bool ED_object_editmode_load(Main *bmain, Object *obedit) return ED_object_editmode_load_free_ex(bmain, obedit, true, false); } -/** - * \param flag: - * - If #EM_FREEDATA isn't in the flag, use ED_object_editmode_load directly. - */ bool ED_object_editmode_exit_ex(Main *bmain, Scene *scene, Object *obedit, int flag) { const bool free_data = (flag & EM_FREEDATA) != 0; @@ -723,11 +709,6 @@ bool ED_object_editmode_exit(bContext *C, int flag) return ED_object_editmode_exit_ex(bmain, scene, obedit, flag); } -/** - * Support freeing edit-mode data without flushing it back to the object. - * - * \return true if data was freed. - */ bool ED_object_editmode_free_ex(Main *bmain, Object *obedit) { return ED_object_editmode_load_free_ex(bmain, obedit, false, true); @@ -1161,11 +1142,6 @@ static bool has_pose_motion_paths(Object *ob) return ob->pose && (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) != 0; } -/* For the objects with animation: update paths for those that have got them - * This should selectively update paths that exist... - * - * To be called from various tools that do incremental updates - */ void ED_objects_recalculate_paths(bContext *C, Scene *scene, eObjectPathCalcRange range, @@ -1428,7 +1404,6 @@ static void object_clear_mpath(Object *ob) } } -/* Clear motion paths for all objects */ void ED_objects_clear_paths(bContext *C, bool only_selected) { if (only_selected) { @@ -1663,10 +1638,10 @@ void OBJECT_OT_shade_smooth(wmOperatorType *ot) /** \name Object Mode Set Operator * \{ */ -static const EnumPropertyItem *object_mode_set_itemsf(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), - bool *r_free) +static const EnumPropertyItem *object_mode_set_itemf(bContext *C, + PointerRNA *UNUSED(ptr), + PropertyRNA *UNUSED(prop), + bool *r_free) { const EnumPropertyItem *input = rna_enum_object_mode_items; EnumPropertyItem *item = NULL; @@ -1815,7 +1790,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) ot->prop = RNA_def_enum( ot->srna, "mode", rna_enum_object_mode_items, OB_MODE_OBJECT, "Mode", ""); - RNA_def_enum_funcs(ot->prop, object_mode_set_itemsf); + RNA_def_enum_funcs(ot->prop, object_mode_set_itemf); RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); prop = RNA_def_boolean(ot->srna, "toggle", 0, "Toggle", ""); diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 92f3d28878c..f5127bd5228 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -53,7 +53,6 @@ #include "object_intern.h" -/* called while not in editmode */ void ED_object_facemap_face_add(Object *ob, bFaceMap *fmap, int facenum) { int fmap_nr; @@ -77,7 +76,6 @@ void ED_object_facemap_face_add(Object *ob, bFaceMap *fmap, int facenum) } } -/* called while not in editmode */ void ED_object_facemap_face_remove(Object *ob, bFaceMap *fmap, int facenum) { int fmap_nr; diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index fe07ecef438..9a1b4b48464 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -45,6 +45,7 @@ enum eObject_Hook_Add_Mode { /* internal exports only */ /* object_transform.c */ + void OBJECT_OT_location_clear(struct wmOperatorType *ot); void OBJECT_OT_rotation_clear(struct wmOperatorType *ot); void OBJECT_OT_scale_clear(struct wmOperatorType *ot); @@ -55,6 +56,7 @@ void OBJECT_OT_transform_axis_target(struct wmOperatorType *ot); void OBJECT_OT_origin_set(struct wmOperatorType *ot); /* object_relations.c */ + void OBJECT_OT_parent_set(struct wmOperatorType *ot); void OBJECT_OT_parent_no_inverse_set(struct wmOperatorType *ot); void OBJECT_OT_parent_clear(struct wmOperatorType *ot); @@ -67,10 +69,18 @@ void OBJECT_OT_convert_proxy_to_override(struct wmOperatorType *ot); void OBJECT_OT_make_single_user(struct wmOperatorType *ot); void OBJECT_OT_make_links_scene(struct wmOperatorType *ot); void OBJECT_OT_make_links_data(struct wmOperatorType *ot); +/** + * Used for drop-box. + * Assigns to object under cursor, only first material slot. + */ void OBJECT_OT_drop_named_material(struct wmOperatorType *ot); +/** + * \note Only for empty-image objects, this operator is needed + */ void OBJECT_OT_unlink_data(struct wmOperatorType *ot); /* object_edit.c */ + void OBJECT_OT_hide_view_set(struct wmOperatorType *ot); void OBJECT_OT_hide_view_clear(struct wmOperatorType *ot); void OBJECT_OT_hide_collection(struct wmOperatorType *ot); @@ -93,6 +103,7 @@ void OBJECT_OT_link_to_collection(struct wmOperatorType *ot); void OBJECT_OT_transfer_mode(struct wmOperatorType *ot); /* object_select.c */ + void OBJECT_OT_select_all(struct wmOperatorType *ot); void OBJECT_OT_select_random(struct wmOperatorType *ot); void OBJECT_OT_select_by_type(struct wmOperatorType *ot); @@ -104,6 +115,7 @@ void OBJECT_OT_select_less(struct wmOperatorType *ot); void OBJECT_OT_select_same_collection(struct wmOperatorType *ot); /* object_add.c */ + void OBJECT_OT_add(struct wmOperatorType *ot); void OBJECT_OT_add_named(struct wmOperatorType *ot); void OBJECT_OT_transform_to_mouse(struct wmOperatorType *ot); @@ -120,6 +132,9 @@ void OBJECT_OT_camera_add(struct wmOperatorType *ot); void OBJECT_OT_speaker_add(struct wmOperatorType *ot); void OBJECT_OT_hair_add(struct wmOperatorType *ot); void OBJECT_OT_pointcloud_add(struct wmOperatorType *ot); +/** + * Only used as menu. + */ void OBJECT_OT_collection_instance_add(struct wmOperatorType *ot); void OBJECT_OT_data_instance_add(struct wmOperatorType *ot); @@ -131,10 +146,15 @@ void OBJECT_OT_join_shapes(struct wmOperatorType *ot); void OBJECT_OT_convert(struct wmOperatorType *ot); /* object_volume.c */ + void OBJECT_OT_volume_add(struct wmOperatorType *ot); +/** + * Called by other space types too. + */ void OBJECT_OT_volume_import(struct wmOperatorType *ot); /* object_hook.c */ + void OBJECT_OT_hook_add_selob(struct wmOperatorType *ot); void OBJECT_OT_hook_add_newob(struct wmOperatorType *ot); void OBJECT_OT_hook_remove(struct wmOperatorType *ot); @@ -144,6 +164,7 @@ void OBJECT_OT_hook_reset(struct wmOperatorType *ot); void OBJECT_OT_hook_recenter(struct wmOperatorType *ot); /* object_collection.c */ + void COLLECTION_OT_create(struct wmOperatorType *ot); void COLLECTION_OT_objects_remove_all(struct wmOperatorType *ot); void COLLECTION_OT_objects_remove(struct wmOperatorType *ot); @@ -151,6 +172,7 @@ void COLLECTION_OT_objects_add_active(struct wmOperatorType *ot); void COLLECTION_OT_objects_remove_active(struct wmOperatorType *ot); /* object_modifier.c */ + bool edit_modifier_poll_generic(struct bContext *C, struct StructRNA *rna_type, int obtype_flag, @@ -249,6 +271,7 @@ void CONSTRAINT_OT_objectsolver_clear_inverse(struct wmOperatorType *ot); void CONSTRAINT_OT_followpath_path_animate(struct wmOperatorType *ot); /* object_vgroup.c */ + void OBJECT_OT_vertex_group_add(struct wmOperatorType *ot); void OBJECT_OT_vertex_group_remove(struct wmOperatorType *ot); void OBJECT_OT_vertex_group_assign(struct wmOperatorType *ot); @@ -279,6 +302,7 @@ void OBJECT_OT_vertex_weight_normalize_active_vertex(struct wmOperatorType *ot); void OBJECT_OT_vertex_weight_copy(struct wmOperatorType *ot); /* object_facemap_ops.c */ + void OBJECT_OT_face_map_add(struct wmOperatorType *ot); void OBJECT_OT_face_map_remove(struct wmOperatorType *ot); void OBJECT_OT_face_map_assign(struct wmOperatorType *ot); @@ -288,9 +312,11 @@ void OBJECT_OT_face_map_deselect(struct wmOperatorType *ot); void OBJECT_OT_face_map_move(struct wmOperatorType *ot); /* object_warp.c */ + void TRANSFORM_OT_vertex_warp(struct wmOperatorType *ot); /* object_shapekey.c */ + void OBJECT_OT_shape_key_add(struct wmOperatorType *ot); void OBJECT_OT_shape_key_remove(struct wmOperatorType *ot); void OBJECT_OT_shape_key_clear(struct wmOperatorType *ot); @@ -299,6 +325,7 @@ void OBJECT_OT_shape_key_mirror(struct wmOperatorType *ot); void OBJECT_OT_shape_key_move(struct wmOperatorType *ot); /* object_collection.c */ + void OBJECT_OT_collection_add(struct wmOperatorType *ot); void OBJECT_OT_collection_link(struct wmOperatorType *ot); void OBJECT_OT_collection_remove(struct wmOperatorType *ot); @@ -306,18 +333,25 @@ void OBJECT_OT_collection_unlink(struct wmOperatorType *ot); void OBJECT_OT_collection_objects_select(struct wmOperatorType *ot); /* object_bake.c */ + void OBJECT_OT_bake_image(wmOperatorType *ot); void OBJECT_OT_bake(wmOperatorType *ot); /* object_random.c */ + void TRANSFORM_OT_vertex_random(struct wmOperatorType *ot); /* object_remesh.cc */ + void OBJECT_OT_voxel_remesh(struct wmOperatorType *ot); void OBJECT_OT_voxel_size_edit(struct wmOperatorType *ot); void OBJECT_OT_quadriflow_remesh(struct wmOperatorType *ot); /* object_transfer_data.c */ + +/** + * Transfer mesh data from active to selected objects. + */ void OBJECT_OT_data_transfer(struct wmOperatorType *ot); void OBJECT_OT_datalayout_transfer(struct wmOperatorType *ot); diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c index 0c1b394a916..d3f72b91366 100644 --- a/source/blender/editors/object/object_modes.c +++ b/source/blender/editors/object/object_modes.c @@ -111,10 +111,6 @@ static const char *object_mode_op_string(eObjectMode mode) return NULL; } -/** - * Checks the mode to be set is compatible with the object - * should be made into a generic function - */ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode) { if (mode == OB_MODE_OBJECT) { @@ -162,11 +158,6 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode) return false; } -/** - * Sets the mode to a compatible state (use before entering the mode). - * - * This is so each mode's exec function can call - */ bool ED_object_mode_compat_set(bContext *C, Object *ob, eObjectMode mode, ReportList *reports) { bool ok; diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 21b978268d9..71ad54383a6 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -152,12 +152,6 @@ static void object_force_modifier_bind_simple_options(Depsgraph *depsgraph, md_eval->mode = mode; } -/** - * Add a modifier to given object, including relevant extra processing needed by some physics types - * (particles, simulations...). - * - * \param scene: is only used to set current frame in some cases, and may be NULL. - */ ModifierData *ED_object_modifier_add( ReportList *reports, Main *bmain, Scene *scene, Object *ob, const char *name, int type) { @@ -264,14 +258,6 @@ static bool object_has_modifier(const Object *ob, const ModifierData *exclude, M return false; } -/* If the object data of 'orig_ob' has other users, run 'callback' on - * each of them. - * - * If include_orig is true, the callback will run on 'orig_ob' too. - * - * If the callback ever returns true, iteration will stop and the - * function value will be true. Otherwise the function returns false. - */ bool ED_object_iter_other(Main *bmain, Object *orig_ob, const bool include_orig, @@ -314,9 +300,6 @@ static bool object_has_modifier_cb(Object *ob, void *data) return object_has_modifier(ob, NULL, type); } -/* Use with ED_object_iter_other(). Sets the total number of levels - * for any multires modifiers on the object to the int pointed to by - * callback_data. */ bool ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v) { int totlevel = *((char *)totlevel_v); @@ -731,7 +714,7 @@ static bool modifier_apply_shape(Main *bmain, BKE_id_free(NULL, mesh_applied); } else { - /* TODO: implement for hair, point-clouds and volumes. */ + /* TODO: implement for hair, point clouds and volumes. */ BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type"); return false; } @@ -830,7 +813,7 @@ static bool modifier_apply_obdata( DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } else { - /* TODO: implement for hair, point-clouds and volumes. */ + /* TODO: implement for hair, point clouds and volumes. */ BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type"); return false; } @@ -1696,6 +1679,8 @@ void OBJECT_OT_modifier_set_active(wmOperatorType *ot) } /** \} */ + +/* ------------------------------------------------------------------- */ /** \name Copy Modifier To Selected Operator * \{ */ @@ -2695,6 +2680,7 @@ void OBJECT_OT_skin_armature_create(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; edit_modifier_properties(ot); } + /** \} */ /* ------------------------------------------------------------------- */ diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index b51644eebf3..811f20e82be 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1783,8 +1783,6 @@ static void single_object_users( BKE_main_collection_sync_remap(bmain); } -/* not an especially efficient function, only added so the single user - * button can be functional. */ void ED_object_single_user(Main *bmain, Scene *scene, Object *ob) { FOREACH_SCENE_OBJECT_BEGIN (scene, ob_iter) { @@ -2644,10 +2642,6 @@ static int drop_named_material_invoke(bContext *C, wmOperator *op, const wmEvent return OPERATOR_FINISHED; } -/** - * Used for drop-box. - * Assigns to object under cursor, only first material slot. - */ void OBJECT_OT_drop_named_material(wmOperatorType *ot) { /* identifiers */ @@ -2706,9 +2700,6 @@ static int object_unlink_data_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -/** - * \note Only for empty-image objects, this operator is needed - */ void OBJECT_OT_unlink_data(wmOperatorType *ot) { /* identifiers */ diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 3bdf7e0d34d..719ffd36f03 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -821,7 +821,8 @@ static Mesh *remesh_symmetry_mirror(Object *ob, Mesh *mesh, eSymmetryAxes symmet mmd.flag = 0; mmd.flag &= MOD_MIR_AXIS_X << i; mesh_mirror_temp = mesh_mirror; - mesh_mirror = BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(&mmd, ob, mesh_mirror, axis); + mesh_mirror = BKE_mesh_mirror_apply_mirror_on_axis_for_modifier( + &mmd, ob, mesh_mirror, axis, true); if (mesh_mirror_temp != mesh_mirror) { BKE_id_free(nullptr, mesh_mirror_temp); } diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index eb37aebcff2..a86dba15469 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -89,14 +89,6 @@ /** \name Public Object Selection API * \{ */ -/** - * Simple API for object selection, rather than just using the flag - * this takes into account the 'restrict selection in 3d view' flag. - * deselect works always, the restriction just prevents selection - * - * \note Caller must send a `NC_SCENE | ND_OB_SELECT` notifier - * (or a `NC_SCENE | ND_OB_VISIBLE` in case of visibility toggling). - */ void ED_object_base_select(Base *base, eObjectSelect_Mode mode) { if (mode == BA_INVERT) { @@ -121,9 +113,6 @@ void ED_object_base_select(Base *base, eObjectSelect_Mode mode) } } -/** - * Call when the active base has changed. - */ void ED_object_base_active_refresh(Main *bmain, Scene *scene, ViewLayer *view_layer) { WM_main_add_notifier(NC_SCENE | ND_OB_ACTIVE, scene); @@ -134,9 +123,6 @@ void ED_object_base_active_refresh(Main *bmain, Scene *scene, ViewLayer *view_la } } -/** - * Change active base, it includes the notifier - */ void ED_object_base_activate(bContext *C, Base *base) { Scene *scene = CTX_data_scene(C); @@ -242,10 +228,6 @@ static int get_base_select_priority(Base *base) return 1; } -/** - * If id is not already an Object, try to find an object that uses it as data. - * Prefers active, then selected, then visible/selectable. - */ Base *ED_object_find_first_by_data_id(ViewLayer *view_layer, ID *id) { BLI_assert(OB_DATA_SUPPORT_ID(GS(id->name))); @@ -279,12 +261,6 @@ Base *ED_object_find_first_by_data_id(ViewLayer *view_layer, ID *id) return base_best; } -/** - * Select and make the target object active in the view layer. - * If already selected, selection isn't changed. - * - * \returns false if not found in current view layer - */ bool ED_object_jump_to_object(bContext *C, Object *ob, const bool UNUSED(reveal_hidden)) { ViewLayer *view_layer = CTX_data_view_layer(C); @@ -316,13 +292,6 @@ bool ED_object_jump_to_object(bContext *C, Object *ob, const bool UNUSED(reveal_ return true; } -/** - * Select and make the target object and bone active. - * Switches to Pose mode if in Object mode so the selection is visible. - * Un-hides the target bone and bone layer if necessary. - * - * \returns false if object not in layer, bone not found, or other error - */ bool ED_object_jump_to_bone(bContext *C, Object *ob, const char *bone_name, diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index 2723d7ad1e3..043a679a0c0 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -402,6 +402,8 @@ void OBJECT_OT_shaderfx_add(wmOperatorType *ot) RNA_def_property_translation_context(ot->prop, BLT_I18NCONTEXT_ID_ID); } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Generic Functions for Operators Using Names and Data Context * \{ */ diff --git a/source/blender/editors/object/object_utils.c b/source/blender/editors/object/object_utils.c index c7dfe911ce7..5f85f6ea0eb 100644 --- a/source/blender/editors/object/object_utils.c +++ b/source/blender/editors/object/object_utils.c @@ -369,10 +369,6 @@ void ED_object_data_xform_container_item_ensure(struct XFormObjectData_Container } } -/** - * This may be called multiple times with the same data. - * Each time, the original transformations are re-applied, instead of accumulating the changes. - */ void ED_object_data_xform_container_update_all(struct XFormObjectData_Container *xds, struct Main *bmain, Depsgraph *depsgraph) diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index f0ab082cd9c..3e74aaeeb10 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -140,9 +140,6 @@ bool ED_vgroup_sync_from_pose(Object *ob) return false; } -/** - * Removes out of range MDeformWeights - */ void ED_vgroup_data_clamp_range(ID *id, const int total) { MDeformVert **dvert_arr; @@ -264,13 +261,6 @@ bool ED_vgroup_parray_alloc(ID *id, return false; } -/** - * For use with tools that use ED_vgroup_parray_alloc with \a use_vert_sel == true. - * This finds the unselected mirror deform verts and copies the weights to them from the selected. - * - * \note \a dvert_array has mirrored weights filled in, - * in case cleanup operations are needed on both. - */ void ED_vgroup_parray_mirror_sync(Object *ob, MDeformVert **dvert_array, const int dvert_tot, @@ -314,11 +304,6 @@ void ED_vgroup_parray_mirror_sync(Object *ob, MEM_freeN(dvert_array_all); } -/** - * Fill in the pointers for mirror verts (as if all mirror verts were selected too). - * - * similar to #ED_vgroup_parray_mirror_sync but only fill in mirror points. - */ void ED_vgroup_parray_mirror_assign(Object *ob, MDeformVert **dvert_array, const int dvert_tot) { BMEditMesh *em = BKE_editmesh_from_object(ob); @@ -383,7 +368,6 @@ void ED_vgroup_parray_remove_zero(MDeformVert **dvert_array, } } -/* matching index only */ bool ED_vgroup_array_copy(Object *ob, Object *ob_from) { MDeformVert **dvert_array_from = NULL, **dvf; @@ -575,9 +559,6 @@ static void ED_mesh_defvert_mirror_update_ob(Object *ob, int def_nr, int vidx) } } -/** - * Use when adjusting the active vertex weight and apply to mirror vertices. - */ void ED_vgroup_vert_active_mirror(Object *ob, int def_nr) { Mesh *me = ob->data; @@ -883,7 +864,6 @@ static void ED_vgroup_nr_vert_add( } } -/* called while not in editmode */ void ED_vgroup_vert_add(Object *ob, bDeformGroup *dg, int vertnum, float weight, int assignmode) { /* add the vert to the deform group with the @@ -912,7 +892,6 @@ void ED_vgroup_vert_add(Object *ob, bDeformGroup *dg, int vertnum, float weight, } } -/* mesh object mode, lattice can be in editmode */ void ED_vgroup_vert_remove(Object *ob, bDeformGroup *dg, int vertnum) { /* This routine removes the vertex from the specified @@ -2369,8 +2348,6 @@ static void dvert_mirror_op(MDeformVert *dvert, } } -/* TODO: vgroup locking. */ -/* TODO: face masking. */ void ED_vgroup_mirror(Object *ob, const bool mirror_weights, const bool flip_vgroups, @@ -2379,6 +2356,8 @@ void ED_vgroup_mirror(Object *ob, int *r_totmirr, int *r_totfail) { + /* TODO: vgroup locking. + * TODO: face masking. */ #define VGROUP_MIRR_OP \ dvert_mirror_op(dvert, \ diff --git a/source/blender/editors/object/object_volume.c b/source/blender/editors/object/object_volume.c index fbdee00c29c..6c92814abc0 100644 --- a/source/blender/editors/object/object_volume.c +++ b/source/blender/editors/object/object_volume.c @@ -158,7 +158,6 @@ static int volume_import_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS return OPERATOR_RUNNING_MODAL; } -/* called by other space types too */ void OBJECT_OT_volume_import(wmOperatorType *ot) { /* identifiers */ |