Commit: 3106f18176f49a3b388e8e1f587d46d232a4a35e Author: Campbell Barton Date: Tue Mar 13 18:06:05 2018 +1100 Branches: master https://developer.blender.org/rB3106f18176f49a3b388e8e1f587d46d232a4a35e
Cleanup: long lines, use doxy sections =================================================================== M source/blender/blenkernel/BKE_object.h M source/blender/editors/include/ED_uvedit.h M source/blender/editors/uvedit/uvedit_ops.c =================================================================== diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 4d232e9ed6c..5578290c41a 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -127,10 +127,12 @@ struct Object *BKE_object_pose_armature_get(struct Object *ob); void BKE_object_get_parent_matrix(struct Scene *scene, struct Object *ob, struct Object *par, float parentmat[4][4]); void BKE_object_where_is_calc(struct Scene *scene, struct Object *ob); -void BKE_object_where_is_calc_ex(struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, float r_originmat[3][3]); +void BKE_object_where_is_calc_ex( + struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, float r_originmat[3][3]); void BKE_object_where_is_calc_time(struct Scene *scene, struct Object *ob, float ctime); -void BKE_object_where_is_calc_time_ex(struct Scene *scene, struct Object *ob, float ctime, - struct RigidBodyWorld *rbw, float r_originmat[3][3]); +void BKE_object_where_is_calc_time_ex( + struct Scene *scene, struct Object *ob, float ctime, + struct RigidBodyWorld *rbw, float r_originmat[3][3]); void BKE_object_where_is_calc_mat4(struct Scene *scene, struct Object *ob, float obmat[4][4]); /* possibly belong in own moduke? */ @@ -146,15 +148,18 @@ void BKE_object_dimensions_set(struct Object *ob, const float value[3]); void BKE_object_empty_draw_type_set(struct Object *ob, const int value); void BKE_object_boundbox_flag(struct Object *ob, int flag, const bool set); void BKE_object_minmax(struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden); -bool BKE_object_minmax_dupli(struct Scene *scene, struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden); +bool BKE_object_minmax_dupli( + struct Scene *scene, struct Object *ob, float r_min[3], float r_max[3], const bool use_hidden); /* sometimes min-max isn't enough, we need to loop over each point */ -void BKE_object_foreach_display_point(struct Object *ob, float obmat[4][4], - void (*func_cb)(const float[3], void *), void *user_data); -void BKE_scene_foreach_display_point(struct Scene *scene, - struct View3D *v3d, - const short flag, - void (*func_cb)(const float[3], void *), void *user_data); +void BKE_object_foreach_display_point( + struct Object *ob, float obmat[4][4], + void (*func_cb)(const float[3], void *), void *user_data); +void BKE_scene_foreach_display_point( + struct Scene *scene, + struct View3D *v3d, + const short flag, + void (*func_cb)(const float[3], void *), void *user_data); bool BKE_object_parent_loop_check(const struct Object *parent, const struct Object *ob); @@ -170,49 +175,61 @@ typedef struct ObjectTfmProtectedChannels { float rotAngle, drotAngle; } ObjectTfmProtectedChannels; -void BKE_object_tfm_protected_backup(const struct Object *ob, - ObjectTfmProtectedChannels *obtfm); +void BKE_object_tfm_protected_backup( + const struct Object *ob, + ObjectTfmProtectedChannels *obtfm); -void BKE_object_tfm_protected_restore(struct Object *ob, - const ObjectTfmProtectedChannels *obtfm, - const short protectflag); +void BKE_object_tfm_protected_restore( + struct Object *ob, + const ObjectTfmProtectedChannels *obtfm, + const short protectflag); /* Dependency graph evaluation callbacks. */ -void BKE_object_eval_local_transform(struct EvaluationContext *eval_ctx, - struct Object *ob); -void BKE_object_eval_parent(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *ob); -void BKE_object_eval_constraints(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *ob); +void BKE_object_eval_local_transform( + struct EvaluationContext *eval_ctx, + struct Object *ob); +void BKE_object_eval_parent( + struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *ob); +void BKE_object_eval_constraints( + struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *ob); void BKE_object_eval_done(struct EvaluationContext *eval_ctx, struct Object *ob); -bool BKE_object_eval_proxy_copy(struct EvaluationContext *eval_ctx, - struct Object *object); -void BKE_object_eval_uber_transform(struct EvaluationContext *eval_ctx, - struct Object *ob); -void BKE_object_eval_uber_data(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *ob); - -void BKE_object_eval_cloth(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *object); - - -void BKE_object_eval_transform_all(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *object); - -void BKE_object_handle_data_update(struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct Object *ob); +bool BKE_object_eval_proxy_copy( + struct EvaluationContext *eval_ctx, + struct Object *object); +void BKE_object_eval_uber_transform( + struct EvaluationContext *eval_ctx, + struct Object *ob); +void BKE_object_eval_uber_data( + struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *ob); + +void BKE_object_eval_cloth( + struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *object); + + +void BKE_object_eval_transform_all( + struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *object); + +void BKE_object_handle_data_update( + struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *ob); void BKE_object_handle_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); -void BKE_object_handle_update_ex(struct EvaluationContext *eval_ctx, - struct Scene *scene, struct Object *ob, - struct RigidBodyWorld *rbw, - const bool do_proxy_update); +void BKE_object_handle_update_ex( + struct EvaluationContext *eval_ctx, + struct Scene *scene, struct Object *ob, + struct RigidBodyWorld *rbw, + const bool do_proxy_update); void BKE_object_sculpt_modifiers_changed(struct Object *ob); int BKE_object_obdata_texspace_get(struct Object *ob, short **r_texflag, float **r_loc, float **r_size, float **r_rot); @@ -255,7 +272,8 @@ typedef enum eObjectSet { OB_SET_ALL /* All Objects */ } eObjectSet; -struct LinkNode *BKE_object_relational_superset(struct Scene *scene, eObjectSet objectSet, eObRelationTypes includeFilter); +struct LinkNode *BKE_object_relational_superset( + struct Scene *scene, eObjectSet objectSet, eObRelationTypes includeFilter); struct LinkNode *BKE_object_groups(struct Object *ob); void BKE_object_groups_clear(struct Scene *scene, struct Base *base, struct Object *object); @@ -263,9 +281,10 @@ struct KDTree *BKE_object_as_kdtree(struct Object *ob, int *r_tot); bool BKE_object_modifier_use_time(struct Object *ob, struct ModifierData *md); -bool BKE_object_modifier_update_subframe(struct Scene *scene, struct Object *ob, bool update_mesh, - int parent_recursion, float frame, - int type); +bool BKE_object_modifier_update_subframe( + struct Scene *scene, struct Object *ob, bool update_mesh, + int parent_recursion, float frame, + int type); #ifdef __cplusplus } diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 354a9655a48..d2d4732eedb 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -49,48 +49,63 @@ struct wmKeyConfig; void ED_operatortypes_uvedit(void); void ED_keymap_uvedit(struct wmKeyConfig *keyconf); -void ED_uvedit_assign_image(struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma); +void ED_uvedit_assign_image( + struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma); bool ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float min[2], float max[2]); void ED_uvedit_select_all(struct BMesh *bm); -bool ED_object_get_active_image(struct Object *ob, int mat_nr, - struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree); +bool ED_object_get_active_image( + struct Object *ob, int mat_nr, + struct Image **r_ima, struct ImageUser **r_iuser, struct bNode **r_node, struct bNodeTree **r_ntree); void ED_object_assign_active_image(struct Main *bmain, struct Object *ob, int mat_nr, struct Image *ima); bool ED_uvedit_test(struct Object *obedit); /* visibility and selection */ bool uvedit_face_visible_test(struct Scene *scene, struct Image *ima, struct BMFace *efa, struct MTexPoly *tf); -bool uvedit_face_select_test(struct Scene *scene, struct BMFace *efa, - const int cd_loop_uv_offset); -bool uvedit_edge_select_test(struct Scene *scene, struct BMLoop *l, - const int cd_loop_uv_offset); -bool uvedit_uv_select_test(struct Scene *scene, struct BMLoop *l, - const int cd_loop_uv_offset); +bool uvedit_face_select_test( + struc @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs