ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
{
int orig_scale = session->proxy_scale;
ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
{
int orig_scale = session->proxy_scale;
int orig_use_scaler = session->proxy_use_scaler;
session->proxy_use_scaler = new_use_scaler;
if( orig_use_scaler ) orig_scale = 1;
int orig_use_scaler = session->proxy_use_scaler;
session->proxy_use_scaler = new_use_scaler;
if( orig_use_scaler ) orig_scale = 1;
- int scale = new_use_scaler ? new_scale : 1;
- int asset_scale = new_scale == 1 && !new_use_scaler ? 0 : scale;
+ int scale = new_use_scaler ? proxy_scale : 1;
+ int asset_scale = !new_scale ? 0 : !new_use_scaler ? 1 : scale;
for( int i=0,n=proxy_assets->size(); i<n; ++i ) {
Indexable *proxy_idxbl = proxy_assets->get(i);
proxy_idxbl->folder_no = folder_no;
if( !proxy_idxbl->is_asset ) continue;
Asset *proxy_asset = assets->update((Asset *)proxy_idxbl);
for( int i=0,n=proxy_assets->size(); i<n; ++i ) {
Indexable *proxy_idxbl = proxy_assets->get(i);
proxy_idxbl->folder_no = folder_no;
if( !proxy_idxbl->is_asset ) continue;
Asset *proxy_asset = assets->update((Asset *)proxy_idxbl);
proxy_asset->width = proxy_asset->actual_width * scale;
proxy_asset->height = proxy_asset->actual_height * scale;
proxy_asset->width = proxy_asset->actual_width * scale;
proxy_asset->height = proxy_asset->actual_height * scale;
- if( new_use_scaler ) new_scale = 1;
- rescale_proxy(orig_scale, new_scale);
+ if( new_use_scaler ) proxy_scale = 1;
+ rescale_proxy(orig_scale, proxy_scale);