[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33404] trunk/blender/source/blender: fix for some mistakes in recent commit.
Campbell Barton
ideasman42 at gmail.com
Wed Dec 1 03:40:13 CET 2010
Revision: 33404
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33404
Author: campbellbarton
Date: 2010-12-01 03:40:13 +0100 (Wed, 01 Dec 2010)
Log Message:
-----------
fix for some mistakes in recent commit.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-12-01 02:28:08 UTC (rev 33403)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2010-12-01 02:40:13 UTC (rev 33404)
@@ -2982,7 +2982,7 @@
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;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-12-01 02:28:08 UTC (rev 33403)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-12-01 02:40:13 UTC (rev 33404)
@@ -2949,7 +2949,7 @@
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 @@
/* 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;
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2010-12-01 02:28:08 UTC (rev 33403)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2010-12-01 02:40:13 UTC (rev 33404)
@@ -115,8 +115,6 @@
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 @@
#else
+static int rna_matrix_dimsize_4x4[]= {4, 4};
+
static void rna_def_vertex_group(BlenderRNA *brna)
{
StructRNA *srna;
More information about the Bf-blender-cvs
mailing list