Revision: 31092soc-2010-jwilkins

Author: nicholasbishop
Date: 11:16:13 PM, Thursday, August 05, 2010
Message:
== Ptex ==

Fixes for triangles

* the quad-mesh-with-triangles example file from ptex contains subfaces with
  non-matching resolutions; changed the internal MPtex format to store
  separate resolutions for each subface

* changed ptex drawing to give each subface its own texture

* various fixes to the loading and painting code to support triangles

* small change to the ptex build files, hopefully fixes and MSVC issue
----
Modified : /branches/soc-2010-nicolasbishop/extern/ptex/CMakeLists.txt
Modified : /branches/soc-2010-nicolasbishop/extern/ptex/SConscript
Modified : /branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/ptex.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c
Modified : /branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_meshdata_types.h

Revision: 31097
Author: nicholasbishop
Date: 12:57:23 AM, Friday, August 06, 2010
Message:
== Ptex ==

* Small bugfix for my previous commit, broke ptex generation

----
Modified : /branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/ptex.c

jwilkins:
Added a temporary pre-processor definition ENABLE_PTEX so I can separate out changes to vertex paint involving ptex from the old vertex paint system.  Although Ptex could be seen as obsoleting vertex paint, I'd like to preserve the old functionality for now.  Later I can refactor so that both systems exist side by side.

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f8da1e1f92e..19c676a8075 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2061,7 +2061,7 @@ static void calc_flatten_center(Sculpt *sd, Object *ob, PBVHNode **nodes, int to
 		if(ss->cache->original) {
 			BLI_pbvh_vertex_iter_begin(ss->pbvh, nodes[n], vd, PBVH_ITER_UNIQUE) {
 				if(sculpt_brush_test_fast(&test, unode->co[vd.i])) {
-					add_v3_v3(private_fc, vd.co);
+					add_v3_v3(private_fc, unode->co[vd.i]);
 					private_count++;
 				}
 			}
@@ -2131,7 +2131,7 @@ static void calc_area_normal_and_flatten_center(Sculpt *sd, Object *ob, PBVHNode
 					add_norm_if(ss->cache->view_normal, private_an, private_out_flip, fno);
 
 					// fc
-					add_v3_v3(private_fc, vd.co);
+					add_v3_v3(private_fc, unode->co[vd.i]);
 					private_count++;
 				}
 			}