[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26107] trunk/blender/source/blender: removed 3D view listener for changing the background image frame.
Campbell Barton
ideasman42 at gmail.com
Tue Jan 19 15:04:33 CET 2010
Revision: 26107
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26107
Author: campbellbarton
Date: 2010-01-19 15:04:33 +0100 (Tue, 19 Jan 2010)
Log Message:
-----------
removed 3D view listener for changing the background image frame.
do this on drawing instead since SCREEN_OT_animation_step isnt calling the notifier (assume this is to be more efficient?). this isnt slow so is ok to do on drawing.
rename BKE_image_user_calc_imanr to BKE_image_user_calc_frame
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_image.h 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h 2010-01-19 14:04:33 UTC (rev 26107)
@@ -128,7 +128,7 @@
void BKE_image_assign_ibuf(struct Image *ima, struct ImBuf *ibuf);
/* called on frame change or before render */
-void BKE_image_user_calc_imanr(struct ImageUser *iuser, int cfra, int fieldnr);
+void BKE_image_user_calc_frame(struct ImageUser *iuser, int cfra, int fieldnr);
/* produce image export path */
int BKE_get_image_export_path(struct Image *im, const char *dest_dir, char *abs, int abs_size, char *rel, int rel_size);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -2214,7 +2214,7 @@
return BKE_image_acquire_ibuf(ima, iuser, NULL);
}
-void BKE_image_user_calc_imanr(ImageUser *iuser, int cfra, int fieldnr)
+void BKE_image_user_calc_frame(ImageUser *iuser, int cfra, int fieldnr)
{
int imanr, len;
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -592,7 +592,7 @@
if(ima->anim) {
iuser->frames = IMB_anim_get_duration(ima->anim);
- BKE_image_user_calc_imanr(iuser, scene->r.cfra, 0);
+ BKE_image_user_calc_frame(iuser, scene->r.cfra, 0);
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -785,6 +785,7 @@
}
/*area (not region) level listener*/
+#if 0 // removed since BKE_image_user_calc_frame is now called in draw_bgpic because screen_ops doesnt call the notifier.
void space_view3d_listener(struct ScrArea *area, struct wmNotifier *wmn)
{
if (wmn->category == NC_SCENE && wmn->data == ND_FRAME) {
@@ -793,10 +794,11 @@
if (v3d->bgpic && v3d->bgpic->ima) {
Scene *scene = wmn->reference;
- BKE_image_user_calc_imanr(&v3d->bgpic->iuser, scene->r.cfra, 0);
+ BKE_image_user_calc_frame(&v3d->bgpic->iuser, scene->r.cfra, 0);
}
}
}
+#endif
/* only called once, from space/spacetypes.c */
void ED_spacetype_view3d(void)
@@ -810,7 +812,7 @@
st->new= view3d_new;
st->free= view3d_free;
st->init= view3d_init;
- st->listener = space_view3d_listener;
+// st->listener = space_view3d_listener;
st->duplicate= view3d_duplicate;
st->operatortypes= view3d_operatortypes;
st->keymap= view3d_keymap;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -1317,9 +1317,12 @@
if(bgpic==NULL) return;
ima= bgpic->ima;
-
- if(ima)
+
+ if(ima) {
+ /* notifier can also call this however screen_ops.c */
+ BKE_image_user_calc_frame(&bgpic->iuser, CFRA, 0);
ibuf= BKE_image_get_ibuf(ima, &bgpic->iuser);
+ }
if(ibuf==NULL || (ibuf->rect==NULL && ibuf->rect_float==NULL) )
return;
if(ibuf->channels!=4)
Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -118,7 +118,7 @@
{
ImageUser *iuser= ptr->data;
- BKE_image_user_calc_imanr(iuser, scene->r.cfra, 0);
+ BKE_image_user_calc_frame(iuser, scene->r.cfra, 0);
}
static EnumPropertyItem *rna_Image_source_itemf(bContext *C, PointerRNA *ptr, int *free)
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -198,7 +198,7 @@
CompBuf *stackbuf= NULL;
/* first set the right frame number in iuser */
- BKE_image_user_calc_imanr(iuser, rd->cfra, 0);
+ BKE_image_user_calc_frame(iuser, rd->cfra, 0);
/* force a load, we assume iuser index will be set OK anyway */
if(ima->type==IMA_TYPE_MULTILAYER)
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -65,7 +65,7 @@
buf1= typecheck_compbuf(in[0]->data, CB_RGBA);
buf2= typecheck_compbuf(in[1]->data, CB_RGBA);
- BKE_image_user_calc_imanr(node->storage, rd->cfra, 0);
+ BKE_image_user_calc_frame(node->storage, rd->cfra, 0);
/* always returns for viewer image, but we check nevertheless */
ibuf= BKE_image_get_ibuf(ima, node->storage);
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -51,7 +51,7 @@
CompBuf *cbuf, *tbuf;
int rectx, recty;
- BKE_image_user_calc_imanr(node->storage, rd->cfra, 0);
+ BKE_image_user_calc_frame(node->storage, rd->cfra, 0);
/* always returns for viewer image, but we check nevertheless */
ibuf= BKE_image_get_ibuf(ima, node->storage);
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c 2010-01-19 12:24:28 UTC (rev 26106)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2010-01-19 14:04:33 UTC (rev 26107)
@@ -92,7 +92,7 @@
/* imap test */
if(tex->ima && ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
- BKE_image_user_calc_imanr(&tex->iuser, cfra, re?re->flag & R_SEC_FIELD:0);
+ BKE_image_user_calc_frame(&tex->iuser, cfra, re?re->flag & R_SEC_FIELD:0);
}
if(tex->type==TEX_PLUGIN) {
More information about the Bf-blender-cvs
mailing list