[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59772] trunk/blender: Related to #36382: for linked object point caches, show a message that disk

[Brecht Van Lommel]

Revision: 59772
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59772
Author:   blendix
Date:     2013-09-03 16:28:53 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Related to #36382: for linked object point caches, show a message that disk
cache must be used for baking.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py	2013-09-03 16:02:55 UTC (rev 59771)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py	2013-09-03 16:28:53 UTC (rev 59772)
@@ -159,6 +159,8 @@
         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 @@
             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()
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2013-09-03 16:02:55 UTC (rev 59771)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2013-09-03 16:28:53 UTC (rev 59772)
@@ -861,7 +861,7 @@
 
 	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);