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

Quiet warnings from last commit.

Browse Source 
Janne: could you check if ptcache_file_pointers_seek() & ptcache_read_init() can be removed?
This commit is contained in:
Campbell Barton
2011-01-02 10:13:17 +00:00
parent 6127bcf854
commit 8c86d2da3a
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -886,7 +886,7 @@ KS_Path *BKE_keyingset_add_path (KeyingSet *ks, ID *id, const char group_name[],
/* just store absolute info */
ksp->id= id;
if (group_name)
BLI_snprintf(ksp->group, 64, group_name);
BLI_strncpy(ksp->group, group_name, sizeof(ksp->group));
else
ksp->group[0]= '\0';

9
source/blender/blenkernel/intern/pointcache.c
View File

@@ -1059,7 +1059,6 @@ static int ptcache_file_compressed_write(PTCacheFile *pf, unsigned char *in, siz
if(compressed == 2)
{
uint32_t size = (uint32_t) sizeOfIt;
ptcache_file_write(pf, &sizeOfIt, 1, sizeof(uint32_t));
ptcache_file_write(pf, props, sizeOfIt, sizeof(unsigned char));
}
@@ -1158,6 +1157,7 @@ static void ptcache_file_pointers_init(PTCacheFile *pf)
pf->cur[BPHYS_DATA_BOIDS] = (data_types & (1<<BPHYS_DATA_BOIDS)) ? &pf->data.boids : NULL;
}
#if 0 // UNUSED
static void ptcache_file_pointers_seek(int index, PTCacheFile *pf)
{
int i, size=0;
@@ -1190,6 +1190,8 @@ static void ptcache_file_pointers_seek(int index, PTCacheFile *pf)
ptcache_file_pointers_init(pf);
}
#endif
void BKE_ptcache_mem_pointers_init(PTCacheMem *pm)
{
int data_types = pm->data_types;
@@ -1528,6 +1530,8 @@ cleanup:
return ret;
}
#if 0 // UNUSED
static int ptcache_read_init(PTCacheID *pid, void **cache, int *totpoint)
{
if(*cache==NULL)
@@ -1563,6 +1567,8 @@ static int ptcache_read_init(PTCacheID *pid, void **cache, int *totpoint)
return pm->frame;
}
}
#endif
static int ptcache_read_stream(PTCacheID *pid, int cfra)
{
PTCacheFile *pf = ptcache_file_open(pid, PTCACHE_FILE_READ, cfra);
@@ -1811,7 +1817,6 @@ static int ptcache_write(PTCacheID *pid, int cfra, int overwrite)
if(overwrite) {
if(cache->flag & PTCACHE_DISK_CACHE) {
PTCacheFile *pf = NULL;
int fra = cfra-1;
while(fra >= cache->startframe && !BKE_ptcache_id_exist(pid, fra))

6
source/blender/editors/space_time/space_time.c
View File

@@ -231,7 +231,7 @@ static void time_cache_free(SpaceTime *stime)
BLI_freelistN(&stime->caches);
}
static void time_cache_refresh(const bContext *C, SpaceTime *stime)
static void time_cache_refresh(SpaceTime *stime)
{
/* Free previous caches to indicate full refresh */
time_cache_free(stime);
@@ -358,7 +358,7 @@ static void time_draw_keyframes(const bContext *C, SpaceTime *stime, ARegion *ar
/* ---------------- */
static void time_refresh(const bContext *C, ScrArea *sa)
static void time_refresh(const bContext *UNUSED(C), ScrArea *sa)
{
SpaceTime *stime = (SpaceTime *)sa->spacedata.first;
ARegion *ar;
@@ -366,7 +366,7 @@ static void time_refresh(const bContext *C, ScrArea *sa)
/* find the main timeline region and refresh cache display*/
for (ar= sa->regionbase.first; ar; ar= ar->next) {
if (ar->regiontype==RGN_TYPE_WINDOW) {
time_cache_refresh(C, stime);
time_cache_refresh(stime);
break;
}
}