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
/
intern
/
object_update.c
diff --git
a/source/blender/blenkernel/intern/object_update.c
b/source/blender/blenkernel/intern/object_update.c
index 2eeb9793c4e1de0b5dc1877edfc5becf972651c2..8df501bd106f504e8e27dd9b99d9b2c31672e0c7 100644
(file)
--- a/
source/blender/blenkernel/intern/object_update.c
+++ b/
source/blender/blenkernel/intern/object_update.c
@@
-300,3
+300,10
@@
void BKE_object_eval_uber_data(EvaluationContext *eval_ctx,
ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME);
}
+
+void BKE_object_eval_proxy_backlink(EvaluationContext *UNUSED(eval_ctx), Object *ob)
+{
+ if (ob->proxy) {
+ ob->proxy->proxy_from = ob;
+ }
+}