Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2015-03-18 12:24:17 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-03-18 12:24:17 +0300
commit59ed1d0a6790e78f7f1837c09ffb12e57ef62a86 (patch)
tree6358030fd030a25d58b5924e49f34d837d0598d8 /release/scripts/startup/bl_ui/properties_object.py
parent56acbcaa0e5edd5ea0e9094253de982836989051 (diff)
Added a cache library pointer to objects as a replacement for CL->GR
pointers. Relationship between CacheLibrary, duplicator Objects and Groups is difficult. There are a number of somewhat conflicting goals: - CacheLibraries write out data for objects and dupli groups. Multiple objects can be stored in the same cache: CL *->* GR - Objects can override a dupli group with different caches: OB *->1 CL - As before, each object can be the duplicator for one group: OB *->1 GR To combine these requirements, the first relationship will be made indirect. Only the Object -> Group/CacheLib relations are explicit pointers in the DNA. For finding all objects contained in a cache library the usual recursive DNA tagging system must then be used.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 165ae5a3680..163c67a54cf 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -294,7 +294,11 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):
elif ob.dupli_type == 'GROUP':
layout.prop(ob, "dupli_group", text="Group")
- layout.prop(ob, "use_dupli_cache")
+ row = layout.row(align=True)
+ row.prop(ob, "cache_library")
+ sub = row.row(align=True)
+ sub.active = ob.cache_library is not None
+ sub.prop(ob, "use_dupli_cache", text="Read", toggle=True)
class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel):