Revision: 30654
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30654
Author: blendix
Date: 2010-07-23 16:34:43 +0200 (Fri, 23 Jul 2010)
Log Message:
-----------
Restore image auto refresh for image editor, code was not updated for 2.5 yet.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_image/image_ops.c
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2010-07-23 13:42:58 UTC (rev 30653)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2010-07-23 14:34:43 UTC (rev 30654)
@@ -33,6 +33,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_object_types.h"
+#include "DNA_node_types.h"
#include "DNA_packedFile_types.h"
#include "DNA_scene_types.h"
@@ -2059,8 +2060,10 @@
void ED_image_update_frame(const bContext *C)
{
- Main *mainp = CTX_data_main(C);
+ Main *mainp= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
+ wmWindowManager *wm= CTX_wm_manager(C);
+ wmWindow *win;
Tex *tex;
/* texture users */
@@ -2073,41 +2076,40 @@
}
}
-#if 0
/* image window, compo node users */
- if(G.curscreen) {
- ScrArea *sa;
- for(sa= G.curscreen->areabase.first; sa; sa= sa->next) {
- if(sa->spacetype==SPACE_VIEW3D) {
- View3D *v3d= sa->spacedata.first;
- if(v3d->bgpic)
- if(v3d->bgpic->iuser.flag &
IMA_ANIM_ALWAYS)
-
BKE_image_user_calc_frame(&v3d->bgpic->iuser, scene->r.cfra, 0);
- }
- else if(sa->spacetype==SPACE_IMAGE) {
- SpaceImage *sima= sa->spacedata.first;
- if(sima->iuser.flag & IMA_ANIM_ALWAYS)
- BKE_image_user_calc_frame(&sima->iuser,
scene->r.cfra, 0);
- }
- else if(sa->spacetype==SPACE_NODE) {
- SpaceNode *snode= sa->spacedata.first;
- if((snode->treetype==NTREE_COMPOSIT) &&
(snode->nodetree)) {
- bNode *node;
- for(node= snode->nodetree->nodes.first;
node; node= node->next) {
- if(node->id &&
node->type==CMP_NODE_IMAGE) {
- Image *ima= (Image
*)node->id;
- ImageUser *iuser=
node->storage;
- if(ELEM(ima->source,
IMA_SRC_MOVIE, IMA_SRC_SEQUENCE))
- if(iuser->flag
& IMA_ANIM_ALWAYS)
-
BKE_image_user_calc_frame(iuser, scene->r.cfra, 0);
+ if(wm) {
+ for(win= wm->windows.first; win; win= win->next) {
+ ScrArea *sa;
+ for(sa= win->screen->areabase.first; sa; sa= sa->next) {
+ if(sa->spacetype==SPACE_VIEW3D) {
+ View3D *v3d= sa->spacedata.first;
+ BGpic *bgpic;
+ for(bgpic= v3d->bgpicbase.first; bgpic;
bgpic= bgpic->next)
+ if(v3d->bgpic->iuser.flag &
IMA_ANIM_ALWAYS)
+
BKE_image_user_calc_frame(&v3d->bgpic->iuser, scene->r.cfra, 0);
+ }
+ else if(sa->spacetype==SPACE_IMAGE) {
+ SpaceImage *sima= sa->spacedata.first;
+ if(sima->iuser.flag & IMA_ANIM_ALWAYS)
+
BKE_image_user_calc_frame(&sima->iuser, scene->r.cfra, 0);
+ }
+ else if(sa->spacetype==SPACE_NODE) {
+ SpaceNode *snode= sa->spacedata.first;
+ if((snode->treetype==NTREE_COMPOSIT) &&
(snode->nodetree)) {
+ bNode *node;
+ for(node=
snode->nodetree->nodes.first; node; node= node->next) {
+ if(node->id &&
node->type==CMP_NODE_IMAGE) {
+ Image *ima=
(Image *)node->id;
+ ImageUser
*iuser= node->storage;
+
if(ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE))
+
if(iuser->flag & IMA_ANIM_ALWAYS)
+
BKE_image_user_calc_frame(iuser, scene->r.cfra, 0);
+ }
}
}
}
}
}
}
-#endif
}
-
-
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
