diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-01 05:40:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-01 05:40:13 +0300 |
commit | ad0dd98f26bc681c92a0a1893c17a3bc484a0cb5 (patch) | |
tree | 34b1e9ed3a91f9bac0e03d791e264585e45da58e | |
parent | b5ba824cf28e61cea21042bf58ef628bef6a2d13 (diff) |
fix for some mistakes in recent commit.
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 440a3136108..c989db9dfd1 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2982,7 +2982,7 @@ void BKE_ptcache_update_info(PTCacheID *pid) if(cache->totpoint > totpoint) sprintf(mem_info, "%i cells + High Resolution cached", totpoint); else - sprintf(mem_info, "%i cells cached"); + sprintf(mem_info, "%i cells cached", totpoint); } else { int cfra = cache->startframe; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index fcff021092d..bcb09ca52c8 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2949,7 +2949,7 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache) static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointCache **ocache, int force_disk) { - PointCache *cache; + PointCache *cache= NULL; if(ptcaches->first) { link_list(fd, ptcaches); @@ -3813,7 +3813,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) /* Smoke uses only one cache from now on, so store pointer convert */ if(smd->domain->ptcaches[1].first || smd->domain->point_cache[1]) { printf("High resolution smoke cache not available due to pointcache update. Please reset the simulation.\n"); - smd->domain->ptcaches[1].first = smd->domain->ptcaches[1].first = NULL; + smd->domain->ptcaches[1].first = NULL; + smd->domain->ptcaches[1].last = NULL; smd->domain->point_cache[1] = NULL; } } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 71f2acac902..555b84484c4 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -115,8 +115,6 @@ EnumPropertyItem object_type_curve_items[] = { OBTYPE_CU_TEXT, {0, NULL, 0, NULL, NULL}}; -static int rna_matrix_dimsize_4x4[]= {4, 4}; -static int rna_matrix_dimsize_3x3[]= {3, 3}; #ifdef RNA_RUNTIME @@ -1131,6 +1129,8 @@ int rna_Camera_object_poll(PointerRNA *ptr, PointerRNA value) #else +static int rna_matrix_dimsize_4x4[]= {4, 4}; + static void rna_def_vertex_group(BlenderRNA *brna) { StructRNA *srna; |