trying second merge again
missed changes in update_uniform before first merge, trying to merge again.
will resolve issue #10 (closed) if I can undo my tangled git mess.
missed changes in update_uniform before first merge, trying to merge again.
will resolve issue #10 (closed) if I can undo my tangled git mess.