Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Related to #36382: for linked object point caches, show a message that disk

Browse Source 
cache must be used for baking.
This commit is contained in:
Brecht Van Lommel
2013-09-03 16:28:53 +00:00
parent b03829b5a1
commit 6cc84d7c99
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/startup/bl_ui/properties_physics_common.py
View File

@@ -159,6 +159,8 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
if cachetype != 'SMOKE': if cachetype != 'SMOKE':
layout.label(text=cache.info) layout.label(text=cache.info)
can_bake = True
if cachetype not in {'SMOKE', 'DYNAMIC_PAINT', 'RIGID_BODY'}: if cachetype not in {'SMOKE', 'DYNAMIC_PAINT', 'RIGID_BODY'}:
split = layout.split() split = layout.split()
split.enabled = enabled and bpy.data.is_saved split.enabled = enabled and bpy.data.is_saved
@@ -178,7 +180,16 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
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 = layout.split()
split.active = can_bake
col = split.column() col = split.column()

2
source/blender/makesrna/intern/rna_object_force.c
View File

@@ -861,7 +861,7 @@ static void rna_def_pointcache(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_library_path", PROP_BOOLEAN, PROP_NONE); 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_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"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change");
prop = RNA_def_property(srna, "point_caches", PROP_COLLECTION, PROP_NONE); prop = RNA_def_property(srna, "point_caches", PROP_COLLECTION, PROP_NONE);