Revision: 31092
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.

Merged with trunk: 36951-37000
Never say good-bye, you'll be back :)

**reverted previous merge, wrong revisions

Merged with trunk: 36994-37000
This should be last revision before moving to soc-2011-onion, good-bye soc-2010-jwilkins, it's been fun :)

* Symmetry Feather option was not appearing
* Moved symmetry feather option to brush area of UI because it is a per-brush option
* Trunk has 'height' and my branch has 'layer_distance', height is way too generic and hard to search for, renamed this to 'layer_limit'
* Made layer limit and persistent base greyed-out if Layer is disabled
* Was getting warnings about gl_TexCoord being deprecated in GLSL version 1.30, so for now it is just gonna use the 1.00 version.

Why warn about deprecation when I explicitly asked for a version that still supports a feature? If I say 1.3, and 1.3 supports gl_TexCoord, then there is no problem with me using it. Kindly stfu compiler.

Deprecation makes people stupid...</rant>

XXX: not sure what persistent base does or if it even still works in my branch.

Fix: The radial control would fail, in sculpt mode, to set size if object-space sizing was enabled.

This was caused because a small part of sculpt's radial control code did not make it into the new version. The old code would set a new object-space size by scaling it proportional to how much the new screen-space size was changed.

The solution I implement here is to do the same scaling inside the RNA callbacks. This way, users of those properties do not have to worry about inconsistency.

I added a comment warning that brush_set_size, brush_set_unified_size, brush_unprojected_radius, and brush_set_unprojected_radius do not guarantee consistency because it is not always possible to precisely know what the new unprojected radius is in all contexts where you might set the size.

I would implement the consistency check at the lower level (in those listed functions) but at this time I think it needs to be looked at to make sure that won't cause problems. In addition, I am not sure that scaling by the ratio of change is strictly correct in all cases.

In any case, this at least fixes the immediate problem.

!!Merge Complete!!
Compiles, cursory testing of on-surface brush, matcaps, and new texture mode.
Known Issue: new radial control does not seem to work with f-key resizing when 'lock size' is enabled. Need to check that this is not bug in trunk as well.

source/tests directory was missing

Merge Cleanup.
Forth to make sure branch is a copy of trunk. This time the revision is 36950. Mostly svn property fixes. Biggest concern was missing 'svn:eol-style = native' tags, but also a lot of random 'svn:mergeinfo=' tages (yes, the merge info was empty). Probably need to remove these in trunk, but I added them back to clean up my diff.

Merged with Merged with trunk: 36905-36950

Merge Cleanup.
Third attempt to make sure branch is a copy of trunk revision 36905. A few more fixes.

Merge Cleanup.
Second attempt to make sure branch is a copy of trunk revision 36905. Just missed a few files.

Merge Cleanup.
First attempt to make sure branch is a copy of trunk revision 36905 except for files that have for sure been edited. There are a few minor edits to the changed files but nothing functional. There will probably be a couple of more commits like this before I get a clean diff.

Merged with trunk: 34893-36905

Merged wm_operators.c with trunk. Had to set asside my on-surface brush code so I can reintegrate it later. revisions 34399-36874

Merged with trunk: 34340-34892

Merged with trunk: 33704-34399

Hand merged sculpt.c with trunk. Revisions: 31364-36811
Previous commit of paint_stroke.c was actually revisions: 30860-36797
Untested, as before this is a starting point and I'm just saving it so I can continue merging.

Hand merged from trunk paint_stroke.c revisions 30641-36811.
Doing it this way means there is no precise history of changes in my branch, but history should be preserved in trunk.
Not compiled or tested yet, just committing to get it saved separately from the rest of this merge.

Merged with trunk: 33093-33703