[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51544] trunk/blender/source/blender: comment quick cache RNA and quiet compiler werning.

[Campbell Barton]

Revision: 51544
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51544
Author:   campbellbarton
Date:     2012-10-23 15:07:09 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
comment quick cache RNA and quiet compiler werning.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/makesdna/DNA_object_force.h
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-10-23 15:01:41 UTC (rev 51543)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-10-23 15:07:09 UTC (rev 51544)
@@ -2572,8 +2572,6 @@
 			ID *data_id = (ID *)ob->data;
 			AnimData *adt = BKE_animdata_from_id(data_id);
 			float ctime = (float)scene->r.cfra;  /* XXX this is bad... */
-			ListBase pidlist;
-			PTCacheID *pid;
 			
 			if (G.debug & G_DEBUG)
 				printf("recalcdata %s\n", ob->id.name + 2);

Modified: trunk/blender/source/blender/makesdna/DNA_object_force.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_force.h	2012-10-23 15:01:41 UTC (rev 51543)
+++ trunk/blender/source/blender/makesdna/DNA_object_force.h	2012-10-23 15:07:09 UTC (rev 51544)
@@ -400,7 +400,7 @@
 //#define PTCACHE_BAKE_EDIT			16
 //#define PTCACHE_BAKE_EDIT_ACTIVE	32
 #define PTCACHE_DISK_CACHE			64
-#define PTCACHE_QUICK_CACHE			128
+//#define PTCACHE_QUICK_CACHE		128  /* removed since 2.64 - [#30974], could be added back in a more useful way */
 #define PTCACHE_FRAMES_SKIPPED		256
 #define PTCACHE_EXTERNAL			512
 #define PTCACHE_READ_INFO			1024

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2012-10-23 15:01:41 UTC (rev 51543)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2012-10-23 15:07:09 UTC (rev 51544)
@@ -820,10 +820,13 @@
 	RNA_def_property_ui_text(prop, "File Path", "Cache file path");
 	RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change");
 
+	/* removed, see PTCACHE_QUICK_CACHE */
+#if 0
 	prop = RNA_def_property(srna, "use_quick_cache", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_QUICK_CACHE);
 	RNA_def_property_ui_text(prop, "Quick Cache", "Update simulation with cache steps");
 	RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change");
+#endif
 
 	prop = RNA_def_property(srna, "info", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "info");