Commit Graph

35168 Commits

Author SHA1 Message Date
Tamito Kajiyama
68ae82bb47 Merged changes in the trunk up to revision 43585.
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-01-21 23:01:25 +00:00
Campbell Barton
b95beea539 style chang, made mainly because I wanted to be able to add breakpoints to MEM_freeN calls which were on the same line as the if's. 2012-01-21 22:00:40 +00:00
Tamito Kajiyama
3667cddf1a Fix for color management not working properly with Freestyle. 2012-01-21 21:58:47 +00:00
Lukas Toenne
b7fbfdbf56 Fix for missing NULL check in socket default_value free function. Some sockets (currently only cycles shader sockets) don't actually have a default_value pointer. 2012-01-21 16:36:06 +00:00
Campbell Barton
ae771e742b change filepath limit from 240 to 1024 2012-01-21 14:54:53 +00:00
Campbell Barton
7add5e2bac Better api use for paths.
Avoid possibly copy past buffer.
2012-01-21 14:48:07 +00:00
Lukas Toenne
2c9f5f1f7c Added DNA_DEPRECATED attribute to some old data in bNodeSocket. DNA_DEPRECATED is disabled in writefile.c now to allow forward compatibility code writing to deprecated member data. 2012-01-21 11:15:01 +00:00
Campbell Barton
c5d7f8e416 formatting edits (<120 line length), remove invalid 'defaults' keyword arg from docs. 2012-01-21 10:27:24 +00:00
Bastien Montagne
56fae37b2a Fix [#29940] Stretch To constraint breaks scaling in Transform constraint.
Compute of dist between ob/bone and target was quite odd and causing that bug.
2012-01-21 09:41:21 +00:00
Mike Erwin
030649cf37 formatted snapquats table so entries line up, rounded to 7 significant digits (fp32 respects ~6), no functional change 2012-01-21 05:27:25 +00:00
Mike Erwin
e6d81c2c44 tidy up ndof handling code -- whitespace, comments, ndof->rvec[0] to ndof->rx, etc. no functional changes 2012-01-21 03:37:44 +00:00
Campbell Barton
a98a75346c quiet warnings and possible NULL checking crash fix for indentation functions. 2012-01-20 23:03:41 +00:00
Campbell Barton
f08a8c5b15 modify number button copy/paste to work as if you enter the button, select text, type into another button the same value.
This means you can copy/paste units and python expressions.
2012-01-20 22:32:47 +00:00
Campbell Barton
3f1584c758 fix 2 bugs
- box packing wasn't flagging out the right free corner of a vertex in some cases.
- tex_space_curve wasn't counting quad displists properly.
2012-01-20 22:09:30 +00:00
Nicholas Bishop
073ea28d58 Skip subsurf normal allocation/calculation when not needed.
CCGSubsurf has already a function to disable calculation of normals,
but seems it wasn't used. This patch changes subsurf UV and
subsurf_calculate_limit_positions() to not calculate normals, and also
not allocate space for them.

Should be no functional changes, just a small speedup/less memory use
during subdivision for these cases.

Code review link:
http://codereview.appspot.com/5558058/
2012-01-20 19:27:04 +00:00
Campbell Barton
acfeb47aa3 use property definitions more consistant with other addons in trunk. (no functional change) 2012-01-20 18:31:23 +00:00
Antony Riakiotakis
635706b0da Try fixing modifier keys not working correctly for uv sculpting. 2012-01-20 18:03:55 +00:00
Tamito Kajiyama
0634b4decd Removed a hard-coded limit that the backbone stretching effect was applied to
stokes with 2D length longer than 50.  Problem report by Forrest Gimp, thanks!
2012-01-20 18:03:12 +00:00
Brecht Van Lommel
5873301257 Sample as Lamp option for world shaders, to enable multiple importance sampling.
By default lighting from the world is computed solely with indirect light
sampling. However for more complex environment maps this can be too noisy, as
sampling the BSDF may not easily find the highlights in the environment map
image. By enabling this option, the world background will be sampled as a lamp,
with lighter parts automatically given more samples.

Map Resolution specifies the size of the importance map (res x res). Before
rendering starts, an importance map is generated by "baking" a grayscale image
from the world shader. This will then be used to determine which parts of the
background are light and so should receive more samples than darker parts.
Higher resolutions will result in more accurate sampling but take more setup
time and memory.

Patch by Mike Farnsworth, thanks!
2012-01-20 17:49:17 +00:00
Lukas Toenne
bddc01a7e1 Minor fix for socket default value conversion. The switch statement would not break correctly. 2012-01-20 16:13:26 +00:00
Campbell Barton
1726853226 comment some dead assibnment and set dummy values for image profile conversion in case of invalid input. 2012-01-20 15:18:57 +00:00
Campbell Barton
605aa16dd7 quiet warnings for using uninialized color var in ED_image_draw_info(). 2012-01-20 14:33:03 +00:00
Lukas Toenne
0b412e4136 Cleanup of default_value handling in node sockets.
The structs stored in the anonymous void *default_value in bNodeSocket are now handled completely inside node_socket.c. All allocation/freeing/duplicating for this has been replaced by the appropriate calls to generic API functions (declared in NOD_socket.h).

This will make the default value handling more reliable for future node socket code. Group socket copying and value conversion has also been moved into the generic socket API file.
2012-01-20 13:27:54 +00:00
Campbell Barton
5c6413f695 fix for scons/linux with opencollada debug libs 2012-01-20 12:32:11 +00:00
Sergey Sharybin
f0fc8c22bb Fix #27120: Bake to image used for rendering glitch (bake feedback loop)
Detect feedback loop and do not bake to images detected in this loop and show
nice warning message in such cases.

It's a way which wouldn't overcomplicate code trying to duplicate images and so
without real benefit.
2012-01-20 07:43:46 +00:00
Andrew Hale
8817aaef3e - Fix for commit 43551 which caused a linking error in blenderplayer.
- Minor clean up for commit 43551.
2012-01-20 05:11:42 +00:00
Campbell Barton
fe71f40f88 misc changes from bmesh, syncing across to trunk, no functional changes 2012-01-20 02:24:01 +00:00
Andrew Hale
62ac943e31 - Added functions to remove mesh vertices, edges and faces. These functions remove a specified number of elements from the end of their respective arrays. For example, removing two vertices removes the last two vertices of the mesh.
- Minor fixes to descriptions of add edge and add face functions.
2012-01-20 02:10:09 +00:00
Nicholas Bishop
181a4b74c1 Small cleanup to parameters of _getSubSurf().
Removed the unused third argument and changed useAging and useArena to
named flags.
2012-01-20 01:43:49 +00:00
Antony Riakiotakis
0960b9e983 smart stitch
=============
* refactoring, separate common functionality to functions.
* enable each uv to check independently for other stitchable uvs. This allows to limit stitch uvs belonging to the same vertex, while previously this was impossible.
* made changes to island rotation when calculated from sole uvs when using midpoint stitch. It should now be evenly distributed across islands. 

There are still some glitches with vertices that have multiple uvs per island for the snap island + midpoint stitch combination. The solution is to precalculate the static island rotation/translation in this case. If I haven't managed to make this work correctly I may turn this combination off before release. It's more like an extra feature than really necessary.
2012-01-20 00:02:48 +00:00
Bastien Montagne
a31d1132e8 Minor code enhancement (replace for loops with while's, and avoid multiple checks to get good face vertex index). No functional changes. 2012-01-19 19:09:59 +00:00
Nicholas Bishop
23bb7fc721 Add missing labels to sculpt/paint sliders.
Thanks Sergey for pointing out
2012-01-19 18:22:55 +00:00
Thomas Dinges
186c0531e2 Remesh Modifier UI:
* Some tweaks to the modifier UI
* Hide sharpness property, instead of greying out. 
The policy is to use greying out when a property depends on a boolean, if it depends on an enum item, hide it.
2012-01-19 17:30:29 +00:00
Brecht Van Lommel
1d46bbef7e Fix issue in recent color commits, was still doing a multiplication by 255 too
many, also don't check uchar range after casting to int, this can still cause
overflow with large float values.
2012-01-19 16:22:22 +00:00
Campbell Barton
167999304e simplify clipping loop 2012-01-19 16:12:40 +00:00
Campbell Barton
c0db6fe04d style edits - < 120 line width 2012-01-19 16:04:44 +00:00
Campbell Barton
f340e0c449 size for static string was too small, we should really have dynamic sized strings to rna functions. 2012-01-19 15:11:22 +00:00
Sergey Sharybin
c82b428b95 yRemove missed/unused "tweak" property from keymap for outliner's border select 2012-01-19 11:27:00 +00:00
Miika Hamalainen
25a5915650 Dynamic Paint:
* Added "Project" option also for "Volume + Proximity" brush type.
2012-01-19 11:13:41 +00:00
Campbell Barton
a87c5eb52c use color conversions functions in more places.
also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
Daniel Genrich
47514a0d71 Baked edit: Make particle edit mode more usable for Softbodies and Cloth (jahka gave "OK") 2012-01-19 09:58:25 +00:00
Campbell Barton
879c13bbfc rename rgb_float_to_byte, rgb_byte_to_float to rgb_float_to_uchar, rgb_uchar_to_float and swap args (math functions mostly have dest arg first like strcpy). 2012-01-19 09:09:00 +00:00
Campbell Barton
4786541285 add utility functions linearrgb_to_srgb_uchar4,
linearrgb_to_srgb_uchar3, was being done inline.
2012-01-19 08:22:23 +00:00
Nicholas Bishop
65fca39f77 Fix for building in release mode with scons.
Change given thumbs up from JesterKing.
2012-01-19 07:12:30 +00:00
Mike Erwin
480b1030f9 added support for the 3Dconnexion SpaceMouse Pro -- tested on Linux w/ spacenavd, Macs need latest driver (Intel only (grumble)), Windows should be good as well but have not tested 2012-01-19 06:14:50 +00:00
Nicholas Bishop
a2f1cb40b0 Remove a couple more unneeded variables from paint cursor drawing. 2012-01-19 04:13:58 +00:00
Nicholas Bishop
6947db25a8 Fix a minor RNA warning.
function warning.
2012-01-19 04:04:05 +00:00
Nicholas Bishop
6afac2d345 Couple minor fixes for DM_debug_print().
Fix a gcc warning by not using the DM_debug_info string as the format
string, also free the string after printing.
2012-01-19 04:00:27 +00:00
Nicholas Bishop
d526fc3e20 Remove some unused alpha code in paint_cursor. 2012-01-19 04:00:03 +00:00
Nicholas Bishop
2953542c6e Remove stroke parameter from PaintStroke's StrokeGetLocation callback.
Only affected sculpt.
2012-01-19 03:13:01 +00:00