[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32137] trunk/blender/source/blender/ blenkernel/intern/object.c: bugfix [#24015] Deleting Objects with a Point Density Texture and Rendering Crashes Blender
Campbell Barton
ideasman42 at gmail.com
Mon Sep 27 07:03:47 CEST 2010
Revision: 32137
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32137
Author: campbellbarton
Date: 2010-09-27 07:02:54 +0200 (Mon, 27 Sep 2010)
Log Message:
-----------
bugfix [#24015] Deleting Objects with a Point Density Texture and Rendering Crashes Blender
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/object.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2010-09-27 02:52:12 UTC (rev 32136)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2010-09-27 05:02:54 UTC (rev 32137)
@@ -532,12 +532,10 @@
}
/* textures */
- tex= bmain->tex.first;
- while(tex) {
- if(tex->env) {
- if(tex->env->object == ob) tex->env->object= NULL;
- }
- tex= tex->id.next;
+ for(tex= bmain->tex.first; tex; tex= tex->id.next) {
+ if(tex->env && (ob==tex->env->object)) tex->env->object= NULL;
+ if(tex->pd && (ob==tex->pd->object)) tex->pd->object= NULL;
+ if(tex->vd && (ob==tex->vd->object)) tex->vd->object= NULL;
}
/* worlds */
More information about the Bf-blender-cvs
mailing list