projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mask mods- accel rotate/scale, gang rotate/scale/xlate, high-lite active mask tracks...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
playback3d.C
diff --git
a/cinelerra-5.1/cinelerra/playback3d.C
b/cinelerra-5.1/cinelerra/playback3d.C
index 1c7ddc75701e8fbcbebc5779aebe4e32e3bc6028..e9b087fb16636af0075899302e9ace701f002720 100644
(file)
--- a/
cinelerra-5.1/cinelerra/playback3d.C
+++ b/
cinelerra-5.1/cinelerra/playback3d.C
@@
-38,6
+38,7
@@
#include "pluginclient.h"
#include "pluginvclient.h"
#include "edlsession.h"
#include "pluginclient.h"
#include "pluginvclient.h"
#include "edlsession.h"
+#include "track.h"
#include "transportque.inc"
#include "vframe.h"
#include "transportque.inc"
#include "vframe.h"
@@
-1294,9
+1295,11
@@
void Playback3D::do_mask_sync(Playback3DCommand *command)
glClearColor(bg, bg, bg, bg);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(bg, bg, bg, bg);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ int show_mask = command->keyframe_set->track->masks;
for(int k = 0; k < total_submasks; k++) {
MaskPointSet &points = point_set[k];
MaskEdge &edge = *edges.append(new MaskEdge());
for(int k = 0; k < total_submasks; k++) {
MaskPointSet &points = point_set[k];
MaskEdge &edge = *edges.append(new MaskEdge());
+ if( !((show_mask>>k) & 1) ) continue;
int first_point = 0;
// Need to tabulate every vertex in persistent memory because
// gluTessVertex doesn't copy them.
int first_point = 0;
// Need to tabulate every vertex in persistent memory because
// gluTessVertex doesn't copy them.