[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28183] branches/render25/source/blender/ blenkernel/intern: committed by mistake last commit
Campbell Barton
ideasman42 at gmail.com
Wed Apr 14 00:52:32 CEST 2010
Revision: 28183
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28183
Author: campbellbarton
Date: 2010-04-14 00:52:28 +0200 (Wed, 14 Apr 2010)
Log Message:
-----------
committed by mistake last commit
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/scene.c
Modified: branches/render25/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/image.c 2010-04-13 22:50:09 UTC (rev 28182)
+++ branches/render25/source/blender/blenkernel/intern/image.c 2010-04-13 22:52:28 UTC (rev 28183)
@@ -1,4 +1,4 @@
-/* image.c
+/* image.c
*
* $Id$
*
@@ -2013,7 +2013,6 @@
if(ima->type==IMA_TYPE_R_RESULT) {
/* always verify entirely, not that this shouldn't happen
* during render anyway */
- printf("G.rendering %d\n", G.rendering);
}
else if(ima->type==IMA_TYPE_COMPOSITE) {
frame= iuser?iuser->framenr:0;
@@ -2063,7 +2062,7 @@
/* try to get the ibuf without locking */
ibuf= image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
- if(ibuf == NULL && ima->type != IMA_TYPE_R_RESULT) {
+ if(ibuf == NULL) {
/* couldn't get ibuf and image is not ok, so let's lock and try to
* load the image */
BLI_lock_thread(LOCK_IMAGE);
Modified: branches/render25/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/modifier.c 2010-04-13 22:50:09 UTC (rev 28182)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c 2010-04-13 22:52:28 UTC (rev 28183)
@@ -83,7 +83,10 @@
INIT_TYPE(MeshDeform);
INIT_TYPE(ParticleSystem);
INIT_TYPE(ParticleInstance);
- INIT_TYPE(Explode);
+ INIT_TYPE(Explode);
+ INIT_TYPE(Cloth);
+ INIT_TYPE(Collision);
+ INIT_TYPE(Bevel);
INIT_TYPE(Shrinkwrap);
INIT_TYPE(Fluidsim);
INIT_TYPE(Mask);
Modified: branches/render25/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/scene.c 2010-04-13 22:50:09 UTC (rev 28182)
+++ branches/render25/source/blender/blenkernel/intern/scene.c 2010-04-13 22:52:28 UTC (rev 28183)
@@ -958,7 +958,7 @@
}
/* XXX - this is called far to often, should be made apart of the depgraph */
-// BKE_ptcache_quick_cache_all(scene);
+ BKE_ptcache_quick_cache_all(scene);
/* in the future this should handle updates for all datablocks, not
only objects and scenes. - brecht */
More information about the Bf-blender-cvs
mailing list