projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into blender2.8
[blender.git]
/
source
/
blender
/
blenkernel
/
BKE_object.h
diff --git
a/source/blender/blenkernel/BKE_object.h
b/source/blender/blenkernel/BKE_object.h
index 1bb1e5fab53ada83b83ef380ccb677f6f5c7adff..7f0234a1bc822f48fa6f257de32b1375e3410e79 100644
(file)
--- a/
source/blender/blenkernel/BKE_object.h
+++ b/
source/blender/blenkernel/BKE_object.h
@@
-205,6
+205,8
@@
void BKE_object_eval_uber_data(struct EvaluationContext *eval_ctx,
struct Scene *scene,
struct Object *ob);
+void BKE_object_eval_proxy_backlink(struct EvaluationContext *eval_ctx, struct Object *ob);
+
void BKE_object_handle_data_update(struct EvaluationContext *eval_ctx,
struct Scene *scene,
struct Object *ob);