diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-11 19:45:17 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-11 19:45:17 +0300 |
| commit | feb210f08ebd5d6283624996883719b00fa590eb (patch) | |
| tree | f08814d79d54c87810a320a0f6f101ba5e1a1175 /source/blender/include | |
| parent | 97f892b86b9b31e8165c27c698da7996dfd2d0a2 (diff) | |
Experimental feature, especially for the animation department:
THE OBJECT PROXY
Or simple said; local control of referenced data from libraries.
Having library files with references is a very common studio setup, and
Blender did do quite well in that area. Were it not that for character
setups it was impossible to use still.
This commit will enable a full rig+character to remain in the library,
and still have - under strict control - local access for animation edits.
Full log:
http://www.blender3d.org/cms/Proxy_Objects.824.0.html
Diffstat (limited to 'source/blender/include')
| -rw-r--r-- | source/blender/include/BDR_editobject.h | 1 | ||||
| -rw-r--r-- | source/blender/include/BIF_interface.h | 1 | ||||
| -rw-r--r-- | source/blender/include/BIF_outliner.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/include/BDR_editobject.h b/source/blender/include/BDR_editobject.h index b86209f46f6..4a175728d99 100644 --- a/source/blender/include/BDR_editobject.h +++ b/source/blender/include/BDR_editobject.h @@ -55,6 +55,7 @@ void set_slowparent(void); void make_vertex_parent(void); int test_parent_loop(struct Object *par, struct Object *ob); void make_parent(void); +void make_proxy(void); #define EM_WAITCURSOR (1 << 0) #define EM_FREEDATA (1 << 1) diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h index 41a5bc5e5a1..0f263096792 100644 --- a/source/blender/include/BIF_interface.h +++ b/source/blender/include/BIF_interface.h @@ -163,6 +163,7 @@ struct ScrArea; #define BUT_COLORBAND (30<<9) #define BUT_NORMAL (31<<9) #define BUT_CURVE (32<<9) +#define BUT_TOGDUAL (33<<9) #define BUTTYPE (63<<9) diff --git a/source/blender/include/BIF_outliner.h b/source/blender/include/BIF_outliner.h index 4d281e08c14..dc71d02970c 100644 --- a/source/blender/include/BIF_outliner.h +++ b/source/blender/include/BIF_outliner.h @@ -71,6 +71,7 @@ typedef struct TreeElement { #define TSE_VERSE_OBJ_NODE 16 #define TSE_VERSE_GEOM_NODE 17 /*#endif*/ +#define TSE_PROXY 18 /* outliner search flags */ #define OL_FIND 0 |