diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 19:07:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 19:07:09 +0400 |
| commit | 90f7b9e9cc266c740b2925de88c7bbca73e1fce6 (patch) | |
| tree | aaf12bd27fdcb664ddc7303930a3a082b28039d2 /source/blender | |
| parent | 88a23b5327070c58eb468b965a30999e77e75b71 (diff) | |
comment quick cache RNA and quiet compiler werning.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 212f4187d89..d50c82ca589 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2572,8 +2572,6 @@ void BKE_object_handle_update(Scene *scene, Object *ob) 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); diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 12771d76159..5cc56d861a3 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -400,7 +400,7 @@ typedef struct SoftBody { //#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 diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 940d59ec9b3..f47b864d25a 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -820,10 +820,13 @@ static void rna_def_pointcache(BlenderRNA *brna) 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"); |