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

comment quick cache RNA and quiet compiler werning.

Browse Source
This commit is contained in:
Campbell Barton
2012-10-23 15:07:09 +00:00
parent 88a23b5327
commit 90f7b9e9cc
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/object.c
View File

@@ -2572,8 +2572,6 @@ void BKE_object_handle_update(Scene *scene, Object *ob)
ID *data_id = (ID *)ob->data; ID *data_id = (ID *)ob->data;
AnimData *adt = BKE_animdata_from_id(data_id); AnimData *adt = BKE_animdata_from_id(data_id);
float ctime = (float)scene->r.cfra; /* XXX this is bad... */ float ctime = (float)scene->r.cfra; /* XXX this is bad... */
ListBase pidlist;
PTCacheID *pid;
if (G.debug & G_DEBUG) if (G.debug & G_DEBUG)
printf("recalcdata %s\n", ob->id.name + 2); printf("recalcdata %s\n", ob->id.name + 2);

2
source/blender/makesdna/DNA_object_force.h
View File

@@ -400,7 +400,7 @@ typedef struct SoftBody {
//#define PTCACHE_BAKE_EDIT 16 //#define PTCACHE_BAKE_EDIT 16
//#define PTCACHE_BAKE_EDIT_ACTIVE 32 //#define PTCACHE_BAKE_EDIT_ACTIVE 32
#define PTCACHE_DISK_CACHE 64 #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_FRAMES_SKIPPED 256
#define PTCACHE_EXTERNAL 512 #define PTCACHE_EXTERNAL 512
#define PTCACHE_READ_INFO 1024 #define PTCACHE_READ_INFO 1024

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

@@ -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_ui_text(prop, "File Path", "Cache file path");
RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); 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); 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_boolean_sdna(prop, NULL, "flag", PTCACHE_QUICK_CACHE);
RNA_def_property_ui_text(prop, "Quick Cache", "Update simulation with cache steps"); RNA_def_property_ui_text(prop, "Quick Cache", "Update simulation with cache steps");
RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change");
#endif
prop = RNA_def_property(srna, "info", PROP_STRING, PROP_NONE); prop = RNA_def_property(srna, "info", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "info"); RNA_def_property_string_sdna(prop, NULL, "info");