[Bf-blender-cvs] [478642f] cycles-ptex-49: Fix max_width calculation in Ptex packed layout

[Nicholas Bishop]

Commit: 478642ff1c146d47f4066bfccb8fbb2d8e4a8bf3
Author: Nicholas Bishop
Date:   Mon Feb 9 17:31:25 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB478642ff1c146d47f4066bfccb8fbb2d8e4a8bf3

Fix max_width calculation in Ptex packed layout

===================================================================

M	extern/ptex/BPX_packed_layout.h

===================================================================

diff --git a/extern/ptex/BPX_packed_layout.h b/extern/ptex/BPX_packed_layout.h
index 03af5f0..b3f73e9 100644
--- a/extern/ptex/BPX_packed_layout.h
+++ b/extern/ptex/BPX_packed_layout.h
@@ -85,8 +85,7 @@ struct BPXPackedLayout {
 
 			dst_x += item.u_res + (2 * border);
 			height = std::max(height, dst_y + item.v_res + (2 * border));
-			max_width = std::max(dst_x + item.u_res + (2 * border),
-								 max_width);
+			max_width = std::max(dst_x, max_width);
 
 			yinc = std::max(yinc, item.v_res + (2 * border));
 		}