summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoi Cohen <roico@roico-desktop.(none)>2007-06-27 00:10:53 +0300
committerRoi Cohen <roico@roico-desktop.(none)>2007-06-27 00:10:53 +0300
commit180997b181545588f6168891a235d4077db93f20 (patch)
tree80c002f955cae26cbf7e35a9303c644aa217f226
parentc5bcecbe0cb492b213c178ce139d13e8a5c4589a (diff)
parent9168aaf5f275491512eb74c8d92939f860468cb0 (diff)
download3d-180997b181545588f6168891a235d4077db93f20.tar.gz
3d-180997b181545588f6168891a235d4077db93f20.tar.bz2
Merge branch 'master' of git+ssh://git.opencompositing.org/git/fusion/plugins/3d
-rw-r--r--3d.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/3d.c b/3d.c
index 18a7fe3..efbecc5 100644
--- a/3d.c
+++ b/3d.c
@@ -999,8 +999,13 @@ static Bool tdInitPluginForDisplay (CompPlugin *p, CompDisplay *d)
static void tdFiniPluginForDisplay (CompPlugin *p, CompDisplay *d)
{
- TD_DISPLAY(d);
- if (strcmp(p->vTable->name, "cube") == 0)
+ TD_DISPLAY(d);
+
+ UNWRAP (tdd, d, finiPluginForDisplay);
+ (*d->finiPluginForDisplay) (p, d);
+ WRAP (tdd, d, finiPluginForDisplay, tdFiniPluginForDisplay);
+
+ if (strcmp(p->vTable->name, "cube") == 0)
{
CompScreen *s;
for (s = d->screens; s; s = s->next)
@@ -1014,10 +1019,6 @@ static void tdFiniPluginForDisplay (CompPlugin *p, CompDisplay *d)
UNWRAP(tds, s, initWindowWalker);
}
}
-
- UNWRAP (tdd, d, finiPluginForDisplay);
- (*d->finiPluginForDisplay) (p, d);
- WRAP (tdd, d, finiPluginForDisplay, tdFiniPluginForDisplay);
}
static Bool tdInitDisplay(CompPlugin * p, CompDisplay * d)
@@ -1049,6 +1050,9 @@ static void tdFiniDisplay(CompPlugin * p, CompDisplay * d)
freeScreenPrivateIndex(d, tdd->screenPrivateIndex);
+ UNWRAP(tdd, d, initPluginForDisplay);
+ UNWRAP(tdd, d, finiPluginForDisplay);
+
free(tdd);
}