Commit Graph

66005 Commits

Author SHA1 Message Date
Tamito Kajiyama
d546002476 Merged changes in the trunk up to revision 40911.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2011-10-10 21:15:11 +00:00
Tamito Kajiyama
28cc31ba11 Stability improvements for the Face Smoothness option.
The instability considered here is due to a persistent failure of the
getFEdge() method in the Interface0D class and its subclasses in the
presence of smooth FEdges.  When the Face Smoothness option is
enabled, the view map is populated with not only sharp FEdges (i.e.,
edges in the original meshes) but also smooth FEdges (i.e., newly
built edges lying on triangular surfaces).  The failure of getFEdge()
caused many related issues because the method is widely used in other
predicates and functions that rely on it.  The most prominent example
of related user-visible problems is a constant failure of the built-in
MaterialF0D.

The main issue and related problems were addressed as follows:

* A bug in the construction of smooth FEdges was fixed.  Individual
smooth FEdges, even when they were detected as a series of smooth
FEdges that constitute one smooth ViewEdge, may have some irregular
geometry in the form of non-uniform OWXFaceLayer::order values.  The
OWXFaceLayer::order values were used in an inappropriate way, so that
resulting smooth ViewEdges may have an FEdge between two subsequent
SVertices that were indeed the same SVertex object.  This was an
unexpected situation that getFEdge() could not handle.

* Another issue in the construction of smooth FEdges was resolved.
When sharp FEdges are constructed, two SVertices at both ends of an
FEdge are generated only when no SVertex exists in a given 3D position
(this way, the original mesh topology is reconstructed from a bunch of
independent triangles that the BlenderFileLoader class passes to the
view map creation process).  This sharing of SVertices was used also
for the generation of SVertices at the two ends of each smooth FEdge,
causing the getFEdge() failure in the presence of smooth FEdges.  The
workaround implemented here is to simply suppress the sharing of
generated SVertices when smooth FEdges are created.

* In the Parameter Editor mode, the built-in MaterialF0D was replaced
with a better implementation that works well with Curves and Strokes.
MaterialF0D does not work with these 1D data types.
2011-10-10 19:57:06 +00:00
Sergey Sharybin
e7c9af8a71 Camera tracking integration
===========================

More safe implementation of delete proxy operator.
2011-10-10 18:19:54 +00:00
Sergey Sharybin
4b9bd20d7f Camera tracking integration
===========================

- Added space_view3d.background_images.add() function to add new background
  image from scripts.
- Added operator to set current clip in clip editor as background in 3d viewport.
- Do not show reconstruction if camera hasn't got camera solver constraint.
- Added button to convert tracking-related constraint to fcurves.
2011-10-10 17:42:04 +00:00
Sergey Sharybin
5f0e32fe6c Camera tracking integration
===========================

- Fixed movie clip cache drawing -- it used to draw both
  distorted and undistorted cached frames.
- Undistort markers position in clip editor when using
  undistorted rendering.
  Can be noticeable slower when displaying paths.
- Display proper image in track preview widget when
  using undistorted rendering.
- Do not mark scoped as dirty when not in tracking mode.
2011-10-10 15:29:39 +00:00
Sergey Sharybin
f881ff0826 Camera tracking integration
===========================

Fixes for tracking job. Now transform can be started just after tracking job is finished.
2011-10-10 15:29:31 +00:00
Sergey Sharybin
027e177905 Merging r40877 through r40911 from trunk into soc-2011-tomato 2011-10-10 15:24:31 +00:00
Joerg Mueller
9cabc57a62 Sequencer audio waveform drawing fix, now assured to be within the strip bounds. 2011-10-10 14:59:13 +00:00
Andrew Wiggin
69732dbe21 Miscellaneous cleanup, comment changes, and asserts. Should be no functional changes. 2011-10-10 14:56:09 +00:00
Andrew Wiggin
5ae7a91eb3 Fix a memory leak when attempting edge slide with no edges selected 2011-10-10 14:35:33 +00:00
Sergey Sharybin
21a755b4f5 Fix #28857: 2.60 rc1 regression?
If displacement mapping is used, normals shouldn't be flipped.
2011-10-10 14:32:08 +00:00
Campbell Barton
90b3bd84da fix [#28850] With "Auto-keyframe" on, the "Selection to Cursor" option doesn't create keyframe. 2011-10-10 12:56:21 +00:00
Sergey Sharybin
92c4fe8713 Revert "Fix #28863: Inconsistent UI inside of the UV/ImageEditor window"
This reverts commit 40899 due to UI department feedback.
2011-10-10 10:35:18 +00:00
Campbell Barton
ac1e737aa8 correct operator name from my own recent changes and edit navmesh rna prop name for consistency 2011-10-10 10:24:26 +00:00
Campbell Barton
54adf3de62 fix bad svn ID tags 2011-10-10 09:44:14 +00:00
Campbell Barton
bc40f11093 header cleanup (no functional changes) 2011-10-10 09:38:02 +00:00
Bastien Montagne
1c0ff6109d Now append/link will start at current blend file directory, if available (lastest used lib keeps priority). 2011-10-10 08:25:28 +00:00
Campbell Barton
317d11214e add in empty modifier slot so dynamic paint files don't break. 2011-10-10 07:50:39 +00:00
Sergey Sharybin
849c64dc50 Fix #28863: Inconsistent UI inside of the UV/ImageEditor window
Make panels which are on left be toggled by T, and which are on right by N.
2011-10-10 07:40:44 +00:00
Campbell Barton
2de1bd7dc5 updates to navmesh
- 2 new navmesh operators, reset and clear navmesh data.
- rename operators to be more consistent with existing names.
- some minor edits to draw function, was getting the custom data for every index when it already had the array.
2011-10-10 07:21:42 +00:00
Andrew Wiggin
429a16ddb1 Some bevel fixes: fix a crash BM_Copy_Attributes when source==target, and fix a memory leak from not cleaning up em->emcopy after calling bevel bmop 2011-10-10 07:21:05 +00:00
Campbell Barton
70cd4b77bb edit error macro formatting (confuses some editors) 2011-10-10 07:10:53 +00:00
Campbell Barton
aa3b531839 fix for using uninitialized stack memory in mesh_foreachScreenFace__mapFunc(), used for face selection. 2011-10-10 06:56:28 +00:00
Campbell Barton
1fd55c3130 update to cmake doc, still needs more work but update references to CVS and MSVC2005 and Python3.1 2011-10-10 04:16:16 +00:00
Campbell Barton
f0cd9f987d - for some reason navmesh wasnt drawing when VBO was enabled.
- fix navmesh crash (may well have been from own changes)
- changing VBO's now redraws all windows - useful for checking if VBO draws differently.
2011-10-10 02:56:26 +00:00
Campbell Barton
bdd7c2d3f4 fix documentation error - [#28862] Method 'difference' doesn't exist in Quaternion object. 2011-10-10 01:14:49 +00:00
Campbell Barton
f6cd962df7 bug #28848 also mentions Ctrl+Backspace isnt working.
added support for ctrl+backspace/delete.
2011-10-10 01:11:40 +00:00
Campbell Barton
a0469c7030 fix [#28860] CRASH loading scene
Sequence strips with missing scenes were missing a NULL check.
2011-10-10 00:38:32 +00:00
Campbell Barton
5699014440 add 3 PLY and STL export tests. 2011-10-10 00:29:23 +00:00
Campbell Barton
7b3ea6cc2c mesh VBO drawing code was swapping red/blue vertex colors - this is confusing because MCol.r is blue and MCol.b is red but not excuse! (and how come nobody noticed this?).
- fixed this error in 4 places.
2011-10-10 00:01:44 +00:00
Campbell Barton
39c4e3ae3c fix for editmode opengl drawing (bug from own recent optimization), need to set glShadeModel() outside glBegin(GL_QUADS / GL_TRIANGLES). 2011-10-09 23:04:31 +00:00
Andrew Wiggin
5e300f40f0 Fix for 28859 (found and reported with fix by nico_ga from #blendercoders) 2011-10-09 21:59:29 +00:00
Campbell Barton
17b66b46ad fix crash for recent navmesh edits when setting a non-mesh object to a navmesh.
also minor cleanup.
2011-10-09 21:43:13 +00:00
Campbell Barton
7306eb84f0 move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls). 2011-10-09 21:11:51 +00:00
Sergey Sharybin
c1aca1ddb3 Camera tracking integration
===========================

Scale compositor node feature: if there's no input and scaling is set to
absolute, generate image with given resolution using color from input
socket as background. Useful to generate "overscanned" foortage.
2011-10-09 20:28:35 +00:00
Sergey Sharybin
6f42be1e70 Camera tracking integration
===========================

Support for (un)distortion of images with overscan. Needed for
easier keeping this up-to-date until proper overscan support is
implemented in renderer. Not exposed into UI yet at all.
2011-10-09 20:28:29 +00:00
Sergey Sharybin
855885425c Merging r40848 through r40876 from trunk into soc-2011-tomato 2011-10-09 20:26:56 +00:00
Andrew Wiggin
d62338578b Fix 28493: Meshes added with many addons revert to only verts on entry to edit mode 2011-10-09 16:59:48 +00:00
Bastien Montagne
9d70e050a2 Fix for update_msg.py, wasn’t filtering out prop names identical to prop identifiers (e.g. "float_array"...). Also updated french po & mo. 2011-10-09 12:41:42 +00:00
Campbell Barton
f19022f8e0 increase the hit radius for vertex selection in weight paint mode - increased to 50 (same as editmode), was 3. 2011-10-09 08:39:38 +00:00
Campbell Barton
aa6d7ebd14 svn merge ^/trunk/blender -r40720:40872 2011-10-09 07:31:15 +00:00
Campbell Barton
8714fb7019 replace sprintf with strcpy where no formatting is done and return value isn't used. 2011-10-09 06:03:38 +00:00
Campbell Barton
6778f7ae05 clear some warnings. 2011-10-09 04:11:18 +00:00
Andrew Wiggin
9d0186fc6a Refactor removedoubles (merge 3 different version of code to find doubles into one). Also fixes a minor bug where automerge would merge any two vertices (not just selected verts into unselected verts like trunk) and fixes the edge slide crash (bug 28688) 2011-10-09 03:05:36 +00:00
Campbell Barton
e60a7fbc57 correction to RNA class api references (only used for docs) 2011-10-09 02:24:51 +00:00
Campbell Barton
ee8078fb12 fix for BUILTIN_KSI_WholeCharacter keying custom string/collection/group properties 2011-10-09 02:11:43 +00:00
Campbell Barton
a378668ac2 text edit: selecting zoomed in text with the mouse had an incorrect offset. 2011-10-09 01:11:07 +00:00
Campbell Barton
e50a485836 text editing: make jumping left/right both act the same way (was skipping an extra char when jumping left). 2011-10-09 00:54:41 +00:00
Campbell Barton
db4b3742a1 button text editing: home/end were not moving the cursor position, only the selecton. 2011-10-09 00:45:26 +00:00
Campbell Barton
a016fdd499 fix [#28848] Editing object name (e.g.), Ctrl-Shift-Arrows don't work as Ctrl-Arrows. 2011-10-09 00:35:31 +00:00