fix for some mistakes in recent commit.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 1 Dec 2010 02:40:13 +0000 (02:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 1 Dec 2010 02:40:13 +0000 (02:40 +0000)
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_object.c

index 440a3136108301c5fff57f7ce0e9a5b1d021f3a8..c989db9dfd15efcc5e34395326705582232ac9ce 100644 (file)
@@ -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;
index fcff021092dda284063345bfa1b3e051f99c3646..bcb09ca52c80d0c7f18f49031809d15001a8d37c 100644 (file)
@@ -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;
                                }
                        }
index 71f2acac902c4ccc65e691aa521f150a4febb510..555b84484c475a578c320372c2c7a53b10afed24 100644 (file)
@@ -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;