diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-30 18:54:21 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-30 18:54:21 +0300 |
| commit | 342c900220ce35f66ceabbbc8347512e66128420 (patch) | |
| tree | f59b0b6d48f7a56629ea1236bade0a586f0e51dd /source/blender/blenkernel/BKE_object.h | |
| parent | 9711d54fb734522102f0c95f661391cb3ca723a2 (diff) | |
Proxy Objects revisited!
The first incarnation assumed that proxies were local objects per
definition. Unfortunately that makes it impossible to - for example -
reference-link an entire Scene with proxies, to be used as a special
character set.
This commit makes the proxy implementation also a bit more clear.
Related work: the scene-sets were not executed fully or correctly for
the dependency graph. That happens now (in 3d view) as well.
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 9ad20b6a586..13566be30b3 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -38,16 +38,6 @@ extern "C" { #endif -/* defines now, might become functions */ - -/* proxy rule: lib_object->proxy == the one we borrow from, only set temporal and cleared here */ -/* local_object->proxy == pointer to library object, saved in files and read */ - -#define OB_COPY_PROXY(a) a->id.lib && a->proxy -#define OB_IS_PROXY(a) a->id.lib==NULL && a->proxy -#define OB_DO_PROXY(a) a->id.lib==NULL && a->proxy && a->proxy_group==NULL - - struct Base; struct Object; struct Camera; |