[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13218] branches/blender2.5/blender/source /blender: Applied a couple sculpt/multires fixes from trunk to blender2.5.
Nicholas Bishop
nicholasbishop at gmail.com
Sat Jan 12 23:06:42 CET 2008
Revision: 13218
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13218
Author: nicholasbishop
Date: 2008-01-12 23:06:42 +0100 (Sat, 12 Jan 2008)
Log Message:
-----------
Applied a couple sculpt/multires fixes from trunk to blender2.5.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c 2008-01-12 21:59:18 UTC (rev 13217)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c 2008-01-12 22:06:42 UTC (rev 13218)
@@ -699,4 +699,6 @@
cm->curve[4].y= 0.20611;
cm->curve[5].x= 1;
cm->curve[5].y= 0;
+
+ curvemapping_changed(sd->cumap, 0);
}
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-01-12 21:59:18 UTC (rev 13217)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-01-12 22:06:42 UTC (rev 13218)
@@ -143,8 +143,6 @@
#include "BLO_undofile.h"
#include "BLO_readblenfile.h" // streaming read pipe, for BLO_readblenfile BLO_readblenfilememory
-//XXX #include "multires.h"
-
#include "readfile.h"
#include "genfile.h"
@@ -6692,29 +6690,9 @@
World *wrld;
if(main->versionfile != 244 || main->subversionfile < 2) {
- Mesh *me;
-
for(sce= main->scene.first; sce; sce= sce->id.next)
sce->r.mode |= R_SSS;
- /* Copy over old per-level multires vertex data
- into a single vertex array in struct Multires */
-
- for(me = main->mesh.first; me; me=me->id.next) {
- if(me->mr) {
- MultiresLevel *lvl = me->mr->levels.last;
- if(lvl) {
- me->mr->verts = lvl->verts;
- lvl->verts = NULL;
- /* Don't need the other vert arrays */
- for(lvl = lvl->prev; lvl; lvl = lvl->prev) {
- MEM_freeN(lvl->verts);
- lvl->verts = NULL;
- }
- }
- }
- }
-
/* correct older action editors - incorrect scrolling */
for(sc= main->screen.first; sc; sc= sc->id.next) {
ScrArea *sa;
@@ -6768,6 +6746,7 @@
Lamp *la;
Material *ma;
ParticleSettings *part;
+ Mesh *me;
/* unless the file was created 2.44.3 but not 2.45, update the constraints */
if ( !(main->versionfile==244 && main->subversionfile==3) &&
@@ -6907,6 +6886,23 @@
}
}
}
+
+ /* Copy over old per-level multires vertex data
+ into a single vertex array in struct Multires */
+ for(me = main->mesh.first; me; me=me->id.next) {
+ if(me->mr && !me->mr->verts) {
+ MultiresLevel *lvl = me->mr->levels.last;
+ if(lvl) {
+ me->mr->verts = lvl->verts;
+ lvl->verts = NULL;
+ /* Don't need the other vert arrays */
+ for(lvl = lvl->prev; lvl; lvl = lvl->prev) {
+ MEM_freeN(lvl->verts);
+ lvl->verts = NULL;
+ }
+ }
+ }
+ }
if (main->versionfile != 245 || main->subversionfile < 1) {
for(la=main->lamp.first; la; la= la->id.next) {
More information about the Bf-blender-cvs
mailing list