From 6cc84d7c99cb30b722aaaba672b4068f265a8f03 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 3 Sep 2013 16:28:53 +0000 Subject: [PATCH] Related to #36382: for linked object point caches, show a message that disk cache must be used for baking. --- .../startup/bl_ui/properties_physics_common.py | 13 ++++++++++++- source/blender/makesrna/intern/rna_object_force.c | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index dcb47b9f015..26587472566 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -159,6 +159,8 @@ def point_cache_ui(self, context, cache, enabled, cachetype): if cachetype != 'SMOKE': layout.label(text=cache.info) + can_bake = True + if cachetype not in {'SMOKE', 'DYNAMIC_PAINT', 'RIGID_BODY'}: split = layout.split() split.enabled = enabled and bpy.data.is_saved @@ -176,9 +178,18 @@ def point_cache_ui(self, context, cache, enabled, cachetype): row.label(text="Compression:") row.prop(cache, "compression", expand=True) - layout.separator() + layout.separator() + + if cache.id_data.library: + can_bake = False + + col = layout.column(align=True) + col.label(text="Linked object baking requires Disk Cache to be enabled", icon='INFO') + else: + layout.separator() split = layout.split() + split.active = can_bake col = split.column() diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 1d2aa08e7cd..298c420f75d 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -861,7 +861,7 @@ static void rna_def_pointcache(BlenderRNA *brna) prop = RNA_def_property(srna, "use_library_path", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", PTCACHE_IGNORE_LIBPATH); - RNA_def_property_ui_text(prop, "Library Path", "Use this files path when library linked into another file"); + RNA_def_property_ui_text(prop, "Library Path", "Use this files path for the disk cache when library linked into another file. For local bakes per scene file, disable this option."); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); prop = RNA_def_property(srna, "point_caches", PROP_COLLECTION, PROP_NONE);