Commit Graph

7333 Commits

Author SHA1 Message Date
16702c1729 Merged changes in the trunk up to revision 41225.
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
46ae692710 Merge with trunk r41342 2011-10-28 17:00:53 +00:00
fae903e263 Dynamic Paint:
* More code changes pointed by Brecht in codereview.
* Some user interface improvements.
* Updating brush settings now also updates canvas preview.
2011-10-28 14:46:09 +00:00
ff837cbe9b svn merge -r41310:41329 ^/trunk/blender 2011-10-28 05:17:09 +00:00
36b8846f6e fix [#29063] reprojetion painting : failed to create opengl offscreen buffer
error report was not passed into the UI and only printed into the terminal, now shows an error popup.
2011-10-28 02:10:02 +00:00
f0ca79bccb Extended the set of conditions for feature edge selection by edge types.
In the Parameter Editor mode, each edge type check button in the Selection
by Edge Types has now an associated toggle button to exclude the edge type
from the feature edge selection.  This allows you to select, for instance,
those edges that are silhouette lines but not external contours.
2011-10-27 20:57:14 +00:00
510c69368b New option for disabling the chaining of feature edges in the Parameter Editor mode. 2011-10-25 23:24:59 +00:00
da8a7928c9 svn merge ^/trunk/blender -r41230:41266 2011-10-24 23:06:27 +00:00
4cd1e6337e Cycles: svn merge -r41225:41232 ^/trunk/blender 2011-10-24 22:32:00 +00:00
55ab66b455 Cycles: svn merge -r41205:41225 ^/trunk/blender 2011-10-24 20:19:04 +00:00
f673fc9293 * Remove view3d.tool_properties reference from UI after removal of this operator. 2011-10-24 20:02:34 +00:00
70bf00a74c svn merge ^/trunk/blender -r41200:41226 . 2011-10-24 08:45:55 +00:00
77a7ec7c61 svn merge ^/trunk/blender -r41150:41175 2011-10-24 05:00:53 +00:00
0503a4f7a6 svn merge ^/trunk/blender -r41100:41150 2011-10-24 04:18:28 +00:00
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
0f5f502f9e minor formatting edits (80 char width) 2011-10-23 12:17:24 +00:00
d541a200c2 rename user interface operator properties from 'op' to 'props' 2011-10-23 00:53:50 +00:00
d4541fd891 Merge with trunk r41197 2011-10-22 16:43:23 +00:00
30cba27987 Dynamic Paint:
* Some changes and cleanup pointed on the codereview.
2011-10-22 16:16:14 +00:00
10af15b85b Cycles: svn merge -r40934:41157 ^/trunk/blender 2011-10-21 20:13:12 +00:00
1a62235417 svn merge -r41171:41170 . --- fix coming next 2011-10-21 08:31:28 +00:00
c22a1721e5 Bugfix [#28967] Attempting to add a new pose to the Pose Library
causes Blender 2.60 RC2 to crash

This commit just rolls back part of r.40868, which was causing crashes
when trying to treat id-property-groups as bpy.type.Property to access
a special "rna_type" attribute added as part of said commit.

The underlying Py-API voodoo here is far too evil (along with the
myriad of ways of creating custom props) to work out an API fix for,
but at least we don't get anymore crashes now. In tests here, this
check even seems redundant!
2011-10-21 06:36:01 +00:00
f21043f32e UI tweak: user texture datablock chooser for fields and warp modifier,
more consistent with other places.
2011-10-20 14:58:53 +00:00
daf51fe6cd A big set of UI messages fixes and tweaks! No functional changes. 2011-10-20 07:56:04 +00:00
4512f10db9 misc edits
- rename define DISABLE_SDL --> WITH_SDL (which was already used in some places)
- blenders interation preset was using orbit rather then turntable 3d view preference (different from factory defaults).
- tagged some unused rna args.
2011-10-20 00:19:21 +00:00
4d2a28c2a9 Revert own commit 41026.
It now had issues when hiding menus with the - icon, space selector disappeared.

I am sorry for that, but I consider this a show stopper eventually. :( 

This commit introduces the issue with narrowed verts/edge/face select in solid/edit mode again.
2011-10-19 18:46:16 +00:00
b4e7451cb0 Merged changes in the trunk up to revision 41099. 2011-10-18 23:36:43 +00:00
638a93b235 svn merge ^/trunk/blender -r41075:41099 2011-10-18 01:09:00 +00:00
dc907ef876 Allow symlinks in user_scripts, this fixes raised exeption in copy_prefs for version_updates 2011-10-17 16:36:03 +00:00
fda2045150 correct spelling errors in comments 2011-10-17 06:58:07 +00:00
ef1a1e1451 svn merge ^/trunk/blender -r41005:41075 2011-10-17 03:40:10 +00:00
67c15da97d docs / clenup (no functional code changes)
- added API examples for mathutils.Color/Euler/Quaternion/Matrix.
- corrected own bad spelling matricies --> matrices.
- minor pep8 edits.
- update CMake ignore file list.
2011-10-17 02:20:53 +00:00
33691eb0e7 Cycles: revert unneeded branch change to particles UI script. 2011-10-16 17:55:39 +00:00
7600c687b2 Cycles: fix sampling issue with certain (transparent) max bounce settings, and
tweak presets/defaults to use 128 instead of 1024.
2011-10-16 17:06:01 +00:00
8fae0c6d7e Particle dupliobject rotation changes:
There has been quite a bit of fuss about particle dupliobject rotation in 2.59, so here are some changes to make things work a bit more consistently and predictably in 2.60.

Much of the confusion has been about what the "Initial rotation" for particles actually means. Simply put it's just a vector that that the particles (and the dupliobjects) are aligned to and around which they can be rotated with the phase controls. I've now renamed these controls under a label "Rotation axis".

In 2.59 and previous versions the dupliobject's global x-axis was aligned to the particle rotation axis for non-hair particles. This meant that the object's own rotation (in addition to the particle rotation) could effect the dupliobjects' rotations. This old behavior can still be used with the "Rotation" option in the particle render panel when object/group is set as the visualization. This option is also activated automatically for old files to maintain backwards compatibility.

Now the default dupliobject rotations ignore the object's own rotation completely and align the object's tracking axis to the particle rotation axis. The tracking axis can be found under the Object tab -> Animation Hacks panel.

In 2.58 the way of calculating the rotation for hair didn't work as intended and enabled many non-functional combinations of options. For this reason I removed most of the rotation options for hair in 2.59. Now the options have been reimplemented better and the dupliobject's tracking axis is aligned to the hair direction by default (Rotation axis = Velocity / Hair). All the other axis options work too along with the phase controls.
2011-10-16 16:14:36 +00:00
d0d16b5ed2 Last minute UI fix:
* Vert/Edge/Face select buttons looked crappy when in EditMode and Wireframe shading. Fixed it.
This commit makes the View3D Template a bit narrower in general, but it's very minor, should be no problem. 
This also fixes some weird increase/decrease of the 3D Mode selector menu when toggling between Textured/Solid and Wireframe/Boundbox shading.
2011-10-15 10:03:21 +00:00
febcb91b82 - add template for defining custom driver functions.
- comment unused assignments.
2011-10-15 07:19:34 +00:00
5da894b1fe misc edits
- cmake/windows was installing locale & font when internationalization was disabled, twice when enabled.
- file selector was using the string size-1, where this isn't needed since string buttons expected this value to be the sizeof(), accounting for '\0'.
- use const char for extension checking funcs.
- minor pep8 edits
2011-10-15 05:01:47 +00:00
9f8608a8ec svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again 2011-10-14 01:49:37 +00:00
4e118bb22f svn merge ^/trunk/blender -r40890:40950 2011-10-14 01:35:20 +00:00
7eadd540d4 svn merge ^/trunk/blender -r40872:40890 2011-10-13 22:50:01 +00:00
8be3249537 Merge with trunk r40991 2011-10-13 21:43:02 +00:00
8bf78d7f56 Dynamic Paint:
* Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster.
* Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps.
* Added clamp/map value to wave image sequence output settings.
* RNA description tweaking.
* General code tweaking.
2011-10-13 20:00:22 +00:00
7360f64a51 radius interpolation was incorrectly greyed out for 2D curves. 2011-10-13 06:07:11 +00:00
5a3540f4d8 Fixes for #26837: MPEG Preseek does not work for some h264 files.
- Display running job template in all sequencer modes
  It was displayed only for sequencer mode without preview.
- Fixed proxy rebuild progress indicator
  It was alsways zero because of incorrect rounding.
- Fixed timecode saving on windows (and probably some other platforms)
  It was caused by incorrect opening file for writting -- it should
  be opened in binary format "wb". This error caused incorrect
  movie duration detection on windows.
- Fixed movie resolution detection for some movies.
  In file attached to report, Blender detected resolution 1920x1088
  instead of 1920x1080. Not sure if this fix is correct or it's
  issue in FFmpeg, but it's something what mplayer using: store
  width/height before running avcodec_open().
- Fixed frame number calculation when building timecodes.
  It was rounding error caused some frames be positioned incorrect
  in several cases (that each 6th frame rendered as next frame
  from report).
2011-10-12 12:49:45 +00:00
50a851b946 python UI was doing a lot of attribute lookups on tool & sculpt tool (not especially efficient & annoying when adding breakpoints into why its not working right). 2011-10-12 00:47:50 +00:00
85818c8209 Cycles: add python render engine option to use new shading nodes or not, instead
of hardcoded check for cycles. Also some other minor code cleaning tweaks.
2011-10-11 17:19:55 +00:00
4f33d65ba1 Cycles: svn merge -r40411:40934 ^/trunk/blender 2011-10-11 14:30:53 +00:00
751aa8c7f4 py api: bpy_extras.io_utils.path_reference() - added library argument so exporters get the paths of linked images right. 2011-10-11 04:36:27 +00:00
fa5275cdfa - bpy.path.abspath(), added optional library argument since any paths from linked datablocks are relative to this, not the blend files path, this saves kludgy path code wherever libraries may be used.
- Image "Edit Externally" operator can now edit relative library images.

also minor edits to navmesh.
2011-10-11 04:09:11 +00:00