Revision: 28182
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28182
Author: campbellbarton
Date: 2010-04-14 00:50:09 +0200 (Wed, 14 Apr 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28180:28181
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
branches/render25/source/blender/modifiers/intern/MOD_build.c
branches/render25/source/blender/modifiers/intern/MOD_cloth.c
branches/render25/source/blender/modifiers/intern/MOD_particleinstance.c
branches/render25/source/blender/modifiers/intern/MOD_particlesystem.c
branches/render25/source/blender/modifiers/intern/MOD_smooth.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
Modified: branches/render25/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/image.c 2010-04-13
22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/blenkernel/intern/image.c 2010-04-13
22:50:09 UTC (rev 28182)
@@ -2013,6 +2013,7 @@
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;
@@ -2062,7 +2063,7 @@
/* try to get the ibuf without locking */
ibuf= image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
- if(ibuf == NULL) {
+ if(ibuf == NULL && ima->type != IMA_TYPE_R_RESULT) {
/* 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:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -83,10 +83,7 @@
INIT_TYPE(MeshDeform);
INIT_TYPE(ParticleSystem);
INIT_TYPE(ParticleInstance);
- INIT_TYPE(Explode);
- INIT_TYPE(Cloth);
- INIT_TYPE(Collision);
- INIT_TYPE(Bevel);
+ INIT_TYPE(Explode);
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:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/blenkernel/intern/scene.c 2010-04-13
22:50:09 UTC (rev 28182)
@@ -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 */
Modified: branches/render25/source/blender/modifiers/intern/MOD_build.c
===================================================================
--- branches/render25/source/blender/modifiers/intern/MOD_build.c
2010-04-13 22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/modifiers/intern/MOD_build.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -271,17 +271,8 @@
return result;
}
-/*
- mti = INIT_TYPE(Build);
- mti->type = eModifierTypeType_Nonconstructive;
- mti->flags = eModifierTypeFlag_AcceptsMesh |
- eModifierTypeFlag_AcceptsCVs;
- mti->initData = buildModifier_initData;
- mti->copyData = buildModifier_copyData;
- mti->dependsOnTime = buildModifier_dependsOnTime;
- mti->applyModifier = buildModifier_applyModifier;
-*/
+
ModifierTypeInfo modifierType_Build = {
/* name */ "Build",
/* structName */ "BuildModifierData",
Modified: branches/render25/source/blender/modifiers/intern/MOD_cloth.c
===================================================================
--- branches/render25/source/blender/modifiers/intern/MOD_cloth.c
2010-04-13 22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/modifiers/intern/MOD_cloth.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -175,9 +175,9 @@
/* structName */ "ClothModifierData",
/* structSize */ sizeof(ClothModifierData),
/* type */ eModifierTypeType_Nonconstructive,
- /* flags */ eModifierTypeFlag_AcceptsMesh |
-
eModifierTypeFlag_UsesPointCache |
-
eModifierTypeFlag_Single,
+ /* flags */ eModifierTypeFlag_AcceptsMesh
+ |
eModifierTypeFlag_UsesPointCache
+ |
eModifierTypeFlag_Single,
/* copyData */ copyData,
/* deformVerts */ 0,
Modified:
branches/render25/source/blender/modifiers/intern/MOD_particleinstance.c
===================================================================
--- branches/render25/source/blender/modifiers/intern/MOD_particleinstance.c
2010-04-13 22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/modifiers/intern/MOD_particleinstance.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -317,10 +317,10 @@
/* structName */ "ParticleInstanceModifierData",
/* structSize */ sizeof(ParticleInstanceModifierData),
/* type */ eModifierTypeType_Constructive,
- /* flags */ eModifierTypeFlag_AcceptsMesh |
-
eModifierTypeFlag_SupportsMapping |
-
eModifierTypeFlag_SupportsEditmode |
-
eModifierTypeFlag_EnableInEditmode,
+ /* flags */ eModifierTypeFlag_AcceptsMesh
+ |
eModifierTypeFlag_SupportsMapping
+ |
eModifierTypeFlag_SupportsEditmode
+ |
eModifierTypeFlag_EnableInEditmode,
/* copyData */ copyData,
/* deformVerts */ 0,
Modified: branches/render25/source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
--- branches/render25/source/blender/modifiers/intern/MOD_particlesystem.c
2010-04-13 22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/modifiers/intern/MOD_particlesystem.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -209,11 +209,11 @@
/* structName */ "ParticleSystemModifierData",
/* structSize */ sizeof(ParticleSystemModifierData),
/* type */ eModifierTypeType_OnlyDeform,
- /* flags */ eModifierTypeFlag_AcceptsMesh |
-
eModifierTypeFlag_SupportsMapping |
-
eModifierTypeFlag_UsesPointCache /* |
-
eModifierTypeFlag_SupportsEditmode |
-
eModifierTypeFlag_EnableInEditmode */,
+ /* flags */ eModifierTypeFlag_AcceptsMesh
+ |
eModifierTypeFlag_SupportsMapping
+ |
eModifierTypeFlag_UsesPointCache /*
+ |
eModifierTypeFlag_SupportsEditmode
+ |
eModifierTypeFlag_EnableInEditmode */,
/* copyData */ copyData,
/* deformVerts */ deformVerts,
Modified: branches/render25/source/blender/modifiers/intern/MOD_smooth.c
===================================================================
--- branches/render25/source/blender/modifiers/intern/MOD_smooth.c
2010-04-13 22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/modifiers/intern/MOD_smooth.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -249,8 +249,8 @@
/* structName */ "SmoothModifierData",
/* structSize */ sizeof(SmoothModifierData),
/* type */ eModifierTypeType_OnlyDeform,
- /* flags */ eModifierTypeFlag_AcceptsMesh |
-
eModifierTypeFlag_SupportsEditmode,
+ /* flags */ eModifierTypeFlag_AcceptsMesh
+ |
eModifierTypeFlag_SupportsEditmode,
/* copyData */ copyData,
/* deformVerts */ deformVerts,
Modified: branches/render25/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/render25/source/blender/windowmanager/intern/wm_files.c
2010-04-13 22:43:48 UTC (rev 28181)
+++ branches/render25/source/blender/windowmanager/intern/wm_files.c
2010-04-13 22:50:09 UTC (rev 28182)
@@ -300,11 +300,11 @@
CTX_wm_window_set(C, CTX_wm_manager(C)->windows.first);
ED_editors_init(C);
- CTX_wm_window_set(C, NULL); /* exits queues */
#ifndef DISABLE_PYTHON
/* run any texts that were loaded in and flagged as modules */
BPY_load_user_modules(C);
#endif
+ CTX_wm_window_set(C, NULL); /* exits queues */
}
else if(retval==1)
BKE_write_undo(C, "Import file");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
