Jens Verwiebe
c963edeb9e
Delete applescript for recommit
2011-10-14 20:11:19 +00:00
Jens Verwiebe
e7095450e7
OSX: commit the omp_set_simulation_threads applescript and copy-routines
2011-10-14 17:54:37 +00:00
Jens Verwiebe
afcf581fb0
OSX: commit the needed steps for compiling with gcc 4.6.1 and OMP_NUM_THREADS env variable setting
2011-10-14 17:27:55 +00:00
Andrew Wiggin
0c151167e5
svn merge ^/trunk/blender -r40997:41005 (to integrate the MSVC build fixes over to bmesh)
2011-10-14 16:23:41 +00:00
Sergey Sharybin
f66cbcb1ad
Remove final e from Francaise
2011-10-14 13:13:13 +00:00
Sergey Sharybin
fdc0edefce
Split language menu into two columns:
...
- Nearly done for languages with >80% strings translated
- In progress for languages which aren't translated enough still.
2011-10-14 13:10:11 +00:00
Brecht Van Lommel
22e4f9e3bb
Fix #28914 : crash loading file saved with cycles builds in trunk.
...
The cause is an unknown node socket type in node groups. Ideally the node system
should handle this better and remove the unknown sockets from groups, but this
is a bit of a risky fix to do now, so instead the shader socket type has been
added, since this is a simple change and the code has been tested well.
2011-10-14 12:20:58 +00:00
Sergey Sharybin
e5e201ccd8
Fix for first part of #28911 : driver not working properly since 2.594
...
Missed id type set for driver target when setting target id.
Patch by me and Campbell.
2011-10-14 11:24:20 +00:00
Andrew Wiggin
c4cb393e45
Fix vertex paint face selection
2011-10-14 09:05:20 +00:00
Andrew Wiggin
309721c2e4
Other part of the MSVC build fix (need definition for "finite" macro from BLI_math.h)
2011-10-14 08:06:59 +00:00
Joerg Mueller
8868f9455c
Hopefully fixing windows build problems with this hack now. :-)
2011-10-14 07:56:33 +00:00
Andrew Wiggin
eaff9a1c1b
Reverting my windows build fix because it breaks the bug fix committed in r40995
2011-10-14 07:41:45 +00:00
Andrew Wiggin
13490b1ac3
Fix MSVC build ( .0f/.0f fires a compiler error )
2011-10-14 05:07:53 +00:00
Campbell Barton
0c0259d931
fix [ #28909 ] OpenCollada export / import sintel lite v2.1 crashes on import.
2011-10-14 02:31:04 +00:00
Andrew Wiggin
f3c8f3d663
Build bug fix, and bug fix for smooth shading on meshes added by python scripts
2011-10-14 02:30:58 +00:00
Campbell Barton
9f8608a8ec
svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again
2011-10-14 01:49:37 +00:00
Campbell Barton
4e118bb22f
svn merge ^/trunk/blender -r40890:40950
2011-10-14 01:35:20 +00:00
Campbell Barton
7eadd540d4
svn merge ^/trunk/blender -r40872:40890
2011-10-13 22:50:01 +00:00
Joerg Mueller
9e17ecf010
Fixing [ #28907 ] Frozen playback.
...
Also fixing two more crashes when audio files don't exist/cannot be read and apply a changed file path of a sound, reported by Jens Verwiebe in IRC.
2011-10-13 22:19:29 +00:00
Campbell Barton
d893ac690c
rename confusing constants (no functional change)
...
- OB_BOUND_POLYT --> OB_BOUND_CONVEX_HULL
- OB_BOUND_POLYH --> OB_BOUND_TRIANGLE_MESH
2011-10-13 22:14:41 +00:00
Miika Hamalainen
8be3249537
Merge with trunk r40991
2011-10-13 21:43:02 +00:00
Miika Hamalainen
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
Campbell Barton
818c098004
comment own recent memory leak fix since it broke edge slide.
2011-10-13 14:32:45 +00:00
Campbell Barton
fa3b4e1830
correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning.
2011-10-13 14:10:38 +00:00
Andrew Wiggin
02b409ee13
Temporary workaround (to unblock a BMesh user) for issue #28869 which is causing a hang when loading some .blend files.
2011-10-13 12:13:56 +00:00
Sergey Sharybin
05b47c28fa
Revert part of recent fix for movie resolution.
...
It helped to make things works better for some movies but it
didn't help proxies to work properly. Correct fix seems a bit larger
and better not be made atm, so to keep behavior of proxies and
original movie consistent keep resolution behaves like it was before
recent changes,
2011-10-13 08:56:21 +00:00
Andrew Wiggin
ce4e6600e6
Fix a memory leak in interpolation
2011-10-13 05:03:58 +00:00
Andrew Wiggin
cccb06d92b
Add nodoubles arg to BM_Make_Face
2011-10-13 04:58:34 +00:00
Campbell Barton
19b9329885
fix for leak when switching between transform rotation modes.
2011-10-13 04:44:39 +00:00
Campbell Barton
03c72a5ba0
ensure grease pencil layer names are unique when set through rna.
2011-10-13 04:06:32 +00:00
Campbell Barton
49b1a319c4
fix [ #28898 ] Segmentation fault when Home key during GreasePencil dopesheet pressed
2011-10-13 03:35:08 +00:00
Campbell Barton
fa033e313e
correct some invalid exception types.
2011-10-13 01:51:45 +00:00
Campbell Barton
276e5f7095
formatting edits & remove debug print.
2011-10-13 01:29:08 +00:00
Campbell Barton
6955c47fac
bpy/rna new property attribute 'data', this means its possible to get back the rna-struct which a property uses.
...
Without this you cant get the bone from an fcurve data path for example, needed to fix bug [#28889 ].
2011-10-13 00:52:09 +00:00
Brecht Van Lommel
9ebfcea8f3
Cycles: revert commit that joined surface/volume socket into a single shader socket,
...
on second thought this makes it a bit too difficult to understand what's going on.
2011-10-12 23:03:12 +00:00
Campbell Barton
cfebab7715
quiet compiler warnings for string formatting in ffmpeg logging
2011-10-12 22:00:53 +00:00
Sergey Sharybin
c6f253f8a6
Compile fix for some platforms (like linux release build environment)
2011-10-12 18:56:55 +00:00
Guillermo S. Romero
dd8eac0d85
Fix typo.
2011-10-12 17:06:15 +00:00
Brecht Van Lommel
7d86c6b157
Cycles: add compatibility check to node link menu.
2011-10-12 16:09:35 +00:00
Brecht Van Lommel
aff03aa778
Cycles: tag shading nodes as being compatible with the old/new shading system,
...
so they only appear in the list when needed. Old shading nodes were previously
disabled entirely, breaking internal renderer compatibility.
2011-10-12 15:54:53 +00:00
Brecht Van Lommel
c3c44f8736
Cycles: don't use glsl in textured draw mode, to keep things simpler and faster
...
there for now. Also add viewport color setting for materials for solid draw mode.
2011-10-12 15:48:26 +00:00
Brecht Van Lommel
9ec1114765
Cycles: make node with multiple input sockets with the same name work. Previously
...
nodes like Mix had their sockets renamed to Color1/Color2, but doing this breaks
compatibility for the internal renderer, so restored it now.
2011-10-12 15:45:52 +00:00
Brecht Van Lommel
7503a7edfb
Cycles: replace surface/volume sockets in output nodes with a single shader socket,
...
decided it's better to render objects as either surface or volume.
This may break the volume rendering patch, but shaders with volume closures still
get tagged as having volume closures, so it should be fixable without too many
changes.
2011-10-12 15:42:35 +00:00
Andrew Wiggin
421fd9f286
Fix for not correctly removing doubles after adding builtin primitive meshes (e.g. uvsphere)
2011-10-12 14:16:05 +00:00
Lukas Toenne
da0354e054
Free cache data when creating a new group from selected nodes. This would leave unfreed memory behind otherwise, since node groups don't have internal caches.
2011-10-12 13:53:03 +00:00
Brecht Van Lommel
4689d78b5c
Workaround for #28864 : crash rendering out file with audio, due to scene audio
...
channels being set to invalid value 0. The cause of this is unclear, this adds
a version patch just to be safe, in case it turns out to be a common issue.
2011-10-12 13:43:56 +00:00
Lukas Toenne
89dd5e933f
Fix for #28876 , alpha over with empty image node gives black result.
...
The image node output is the default value when no image is selected. In pre-2.60 this was always initialized to 0 alpha, the defaults written in the node socket templates were completely ignored for outputs (except for value and RGB input nodes, which use these as button values). Now the stack values are initialized with the template defaults, which are all 0 by default. This patch changes alpha to 0 for image and render layer outputs too.
2011-10-12 13:07:30 +00:00
Andrew Wiggin
ce9ada4c02
Make copy_face use BM_Make_Face instead of BM_Make_Ngon (better perf, and better handling of two-sided faces and other corner cases)
2011-10-12 13:04:41 +00:00
Andrew Wiggin
f45dee7021
For edge slide also save the hide state of the faces the edge will slide on so it doesn't get overwritten to visible.
2011-10-12 13:01:06 +00:00
Lukas Toenne
a85f595721
Fix for #28886 , compositor cache regression bug.
...
The problem was that all outputs got tagged indiscriminately (esp. hidden render layer sockets), leading to full recalculation every time. This was caused by erroneous tagging of bNodeStacks with hasinput/hasoutput flags. This patch restores the old behaviour of tagging all non-static stacks as input values and all outputs that are connected to some input. Only difference is in node groups, where the hasoutput flag is no longer abused for tagging internal buffers, here the is_copy flag is used instead.
2011-10-12 12:55:32 +00:00
