projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for vicons checkin
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
filescene.C
diff --git
a/cinelerra-5.0/cinelerra/filescene.C
b/cinelerra-5.0/cinelerra/filescene.C
index fd9a6e95d3dfad383a8475286569fcde2c024a01..8e0ce29a9d37ba764d38e5faf9da02f896def0ed 100644
(file)
--- a/
cinelerra-5.0/cinelerra/filescene.C
+++ b/
cinelerra-5.0/cinelerra/filescene.C
@@
-22,6
+22,7
@@
#include "asset.h"
#include "bcsignals.h"
#include "asset.h"
#include "bcsignals.h"
+#include "clip.h"
#include "file.h"
#include "filescene.h"
#include "filesystem.h"
#include "file.h"
#include "filescene.h"
#include "filesystem.h"
@@
-1856,7
+1857,7
@@
VFrame* SceneTokens::load_image(char *path)
delete [] data;
delete [] data;
- if(!
cmodel_
has_alpha(result->get_color_model()) )
+ if(!
BC_CModels::
has_alpha(result->get_color_model()) )
printf("SceneTokens::load_image %d: image %s has no alpha channel\n",
__LINE__,
path);
printf("SceneTokens::load_image %d: image %s has no alpha channel\n",
__LINE__,
path);