Revision: 33999
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33999
Author: campbellbarton
Date: 2011-01-02 11:13:17 +0100 (Sun, 02 Jan 2011)
Log Message:
-----------
Quiet warnings from last commit.
Janne: could you check if ptcache_file_pointers_seek() & ptcache_read_init()
can be removed?
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/editors/space_time/space_time.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-01-02
10:05:22 UTC (rev 33998)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-01-02
10:13:17 UTC (rev 33999)
@@ -886,7 +886,7 @@
/* 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';
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-01-02
10:05:22 UTC (rev 33998)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-01-02
10:13:17 UTC (rev 33999)
@@ -1059,7 +1059,6 @@
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 @@
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 @@
ptcache_file_pointers_init(pf);
}
+#endif
+
void BKE_ptcache_mem_pointers_init(PTCacheMem *pm)
{
int data_types = pm->data_types;
@@ -1528,6 +1530,8 @@
return ret;
}
+
+#if 0 // UNUSED
static int ptcache_read_init(PTCacheID *pid, void **cache, int *totpoint)
{
if(*cache==NULL)
@@ -1563,6 +1567,8 @@
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 @@
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))
Modified: trunk/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- trunk/blender/source/blender/editors/space_time/space_time.c
2011-01-02 10:05:22 UTC (rev 33998)
+++ trunk/blender/source/blender/editors/space_time/space_time.c
2011-01-02 10:13:17 UTC (rev 33999)
@@ -231,7 +231,7 @@
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_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 @@
/* 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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
