diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-29 19:45:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-29 19:45:14 +0300 |
commit | 172aa404d83de2f1f67003d21c2194da72b0ef8b (patch) | |
tree | 0323872e8f71acc4a52dfb4df323018854966755 /source/blender/blenkernel/BKE_object.h | |
parent | 62d5a0353d708fb8c30af2ef35ce2288bae4cb51 (diff) | |
parent | 75eb219a2e21abe9c9909d76f85abbb538d8ef9f (diff) |
Merge branch 'blender2.8' into id_override_staticid_override_static
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 31125545670..2b183906f57 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -184,7 +184,6 @@ void BKE_object_tfm_protected_restore(struct Object *ob, /* Dependency graph evaluation callbacks. */ void BKE_object_eval_local_transform(const struct EvaluationContext *eval_ctx, - struct Scene *scene, struct Object *ob); void BKE_object_eval_parent(const struct EvaluationContext *eval_ctx, struct Scene *scene, @@ -194,8 +193,9 @@ void BKE_object_eval_constraints(const struct EvaluationContext *eval_ctx, struct Object *ob); void BKE_object_eval_done(const struct EvaluationContext *eval_ctx, struct Object *ob); +bool BKE_object_eval_proxy_copy(const struct EvaluationContext *eval_ct, + struct Object *object); void BKE_object_eval_uber_transform(const struct EvaluationContext *eval_ctx, - struct Scene *scene, struct Object *ob); void BKE_object_eval_uber_data(const struct EvaluationContext *eval_ctx, struct Scene *scene, @@ -205,6 +205,10 @@ void BKE_object_eval_cloth(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *object); +void BKE_object_eval_transform_all(const struct EvaluationContext *eval_ctx, + struct Scene *scene, + struct Object *object); + void BKE_object_eval_update_shading(const struct EvaluationContext *eval_ctx, struct Object *object); void BKE_object_data_select_update(const struct EvaluationContext *eval_ctx, @@ -226,6 +230,7 @@ void BKE_object_handle_update_ex( 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); |