griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,974 Commits 1 Branch 0 Tags
6bf49c47f85efe5daf6fc9c4828aa323cfd30725
Commit Graph

40974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Sharybin
6bf49c47f8 Merging r50162 through r50171 from trunk into soc-2011-tomato 2012-08-24 09:09:33 +00:00
Sergey Sharybin
501efb0e7c Sequencer: bright/contrast modifier 
Behaves in exactly the same way as bright/contrast compositor node.

Some code could be de-duplicated, like contrast formula and mask
influence, but wouldn't call it stopper for commit since it's
already needed for grading Mango.
 2012-08-24 09:07:04 +00:00
Campbell Barton
93d89ec768 correct assert for customdata overlap, also quiet uninitialized warning in transform. 2012-08-24 08:17:53 +00:00
Nicholas Rishel
cfd21c7852 Gave the spacetype time region header malloc a more descriptive text, consistent with other header mallocs. 2012-08-24 05:14:16 +00:00
Nicholas Rishel
b47a7c7701 Code cleanup: comment referenced an outdated file path + spelling error 2012-08-24 05:12:05 +00:00
Campbell Barton
56b28635e7 code cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our naming convention. 2012-08-23 18:25:45 +00:00
Dalai Felinto
dfbc793d88 bugfix for [32368] Added controllers don't count over 10 
Blender original code (NaN likely) was relying on strcmp to sort the list of controllers.
As it happens, in strcmp 10 < 2, thus the list was never in the right order.

The curious thing is that in 2.49 it worked, but I think it did because the make_unique_prop_names function was called twice. Strange ;)
The solution is to use blender BLI_natstrcmp to do natural sorting
 2012-08-23 17:37:04 +00:00
Campbell Barton
f6a6fa419e fix [#32395] BMesh data interpolation feedback loop 2012-08-23 17:16:11 +00:00
Campbell Barton
65dbeabdc6 style cleanup: indentation, also quiet double promotion warnings for despeckle node. 2012-08-23 16:17:47 +00:00
Sergey Sharybin
e68e1d69e1 Merging r50160 through r50161 from trunk into soc-2011-tomato 2012-08-23 16:15:37 +00:00
Sergey Sharybin
c9d5f32270 Sequencer: display color sample information when mouse is holded down 
Behaves in exactly the same way as image editor's color sampling.

Would be nice to display color managed color too, but that's for tomato branch.
 2012-08-23 16:14:52 +00:00
Campbell Barton
95707955ff svn merge ^/trunk/blender -r50156:50159 2012-08-23 15:16:57 +00:00
Campbell Barton
f4ab3b9d8b sequencer zooms horizontal only from mouse wheel and plus buttons. 2012-08-23 14:49:20 +00:00
Brecht Van Lommel
0dd42fd513 Fix #32387: some mesh modifications breaking other shape keys. 
The vertex shapekey index is now no longer copied, and propagation of offsets
in the basis to other shapekeys is disabled if new vertices were added. The
reason being that the propagation will only be done for the old vertices leaving
the new ones behind, and so doing e.g. subdivide + translate on the basis would
create a mess on other shape keys.
 2012-08-23 13:54:30 +00:00
Sergey Sharybin
6f1680e1b7 Merging r50149 through r50156 from trunk into soc-2011-tomato 2012-08-23 13:51:41 +00:00
Sergey Sharybin
6a13ae2b52 Sequencer: fix for color balance keyframing and modifier renaming 2012-08-23 13:32:54 +00:00
Brecht Van Lommel
32a05baad9 Fix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows. 2012-08-23 11:18:31 +00:00
Brecht Van Lommel
efa97ea40f Fix #32391: new remove doubles "unselected" option was enabled by default, don't 
think this was intentional.
 2012-08-23 10:56:16 +00:00
Brecht Van Lommel
fa6a8b8090 Fix #32389: scons was compiling without iksolver and only itasc since a few days, 
which gave performance issues.
 2012-08-23 10:56:14 +00:00
Campbell Barton
bbd8863956 code cleanup: use const weights for customdata interpolation functions 2012-08-23 09:54:15 +00:00
Mitchell Stokes
fd2c3d1e30 BGE: When creating a controller by linking a sensor and actuator, the created controller will always be an and controller instead of the last controller type added. 2012-08-23 09:24:59 +00:00
Campbell Barton
e91e1814d0 fix own error in BM_data_interp_from_edges() from recent commit. 2012-08-23 09:20:15 +00:00
Sergey Sharybin
1f79fa111f Merging r50147 through r50148 from trunk into soc-2011-tomato 2012-08-23 09:05:45 +00:00
Sergey Sharybin
9bae78ed5d Sequencer: move up/down operators for modifiers 2012-08-23 09:04:30 +00:00
Campbell Barton
6b09ca6cc1 svn merge ^/trunk/blender -r50143:50146 2012-08-23 08:54:06 +00:00
Campbell Barton
40db82e314 alt page up/down now jump between strip center frames (since often the middle frame is a better sample to check). 2012-08-23 08:10:45 +00:00
Campbell Barton
25b7370e86 de-duplicate sequencer jump operator, use next/prev option instead. 2012-08-23 07:39:51 +00:00
Campbell Barton
a4188f6303 svn merge ^/trunk/blender -r50138:50143 2012-08-23 07:14:53 +00:00
Campbell Barton
9ecc6fdcc7 style cleanup 2012-08-23 07:10:48 +00:00
Campbell Barton
4e772065d7 set defaults for de-speckle 2012-08-23 07:02:11 +00:00
Campbell Barton
1ab5a4f0ed despeckle composite node 2012-08-23 06:48:01 +00:00
Campbell Barton
2ddb37b98b nothread was committed to tomato by accident 2012-08-23 06:40:19 +00:00
Campbell Barton
749d98ed71 svn merge ^/trunk/blender -r50132:50138 2012-08-23 06:32:51 +00:00
Campbell Barton
45a0287f45 change I made gave a little nicer bleeding direction for inpaint but introduced dithering artifact. 2012-08-23 06:27:12 +00:00
Campbell Barton
6e90903baf - add BM_data_interp_from_edges() function (matches BM_data_interp_from_verts). 
- bridge-merged now merges edge customdata and flags for verts and edges.
 2012-08-23 05:19:40 +00:00
Campbell Barton
c0c575751d bmesh tool: support for merged-bridge (like bridge, collapsing), with a 
factor to blend between loops.
 2012-08-23 04:55:59 +00:00
Antony Riakiotakis
7683f87f27 Fix compilation on MinGW after recent utf 16 fixes (possibly win32 too). gcc ostream does not support wchar_t, I hope it works as expected with unicode filenames. 2012-08-22 19:01:09 +00:00
Sergey Sharybin
6900c792d1 Merging r50119 through r50132 from trunk into soc-2011-tomato 2012-08-22 17:23:02 +00:00
Sergey Sharybin
b0dd030ba6 Fixed regression introduced in 50107 
Shader preview job localizes material without referencing it as a user,
so don't need to unreference itself as a user from this material.

Added BKE_material_free_ex function which could skip user dereferencing.
This also removed old hack with mtex users.
 2012-08-22 17:22:04 +00:00
Sergey Sharybin
df3c9eb1f7 Color management: code cleanup 2012-08-22 16:48:22 +00:00
Sergey Sharybin
93ca64c12a Sequencer: fix crash caused by incorrect handling of color management on ImBuf duplicate 2012-08-22 16:45:09 +00:00
Campbell Barton
1939baa47d style cleanup 2012-08-22 16:44:32 +00:00
Sergey Sharybin
2dcaa8f863 Sequencer: fix sequence color space applying twice when rendering meta strips 2012-08-22 16:16:38 +00:00
Campbell Barton
6143acf878 hook menu was using last remembered use_bone setting 2012-08-22 15:38:03 +00:00
Sergey Sharybin
78ea8df341 Movie cache: made it thread safe to operate with memory limitor 
Movie cache is using global memory limitor, which isn't thread safe
in some of operations, so it required to add mutex around limitor
operations in movie cache.

It's probably could be solved in a way with less locks involved
bu using different limitor for different areas (like use own limitor
for clips, own limitor for sequencer and so), but that wouldn't be
so easy to control overall memory usage.
 2012-08-22 15:13:14 +00:00
Brecht Van Lommel
84e80b6904 Fix #32301: mesh select more/less not taking hidden vertices/faces into account. 2012-08-22 15:10:07 +00:00
Campbell Barton
b2483c3dbe despeckle node for tomato only 2012-08-22 15:08:41 +00:00
Campbell Barton
3ec93e8c35 doc type correction 2012-08-22 15:04:11 +00:00
Brecht Van Lommel
7f9467098e Fix #32309: missing shortcuts in sculpt mode Hide/Mask menu. Keymap poll was too 
strict, only has to check if we are in sculpt mode, not if the mouse is in the
main region too.
 2012-08-22 14:27:09 +00:00
Brecht Van Lommel
d3f1222d38 Fix #32262: mesh bridge between edge loops failed to find a good edge matching 
in some cases, in particular when the the edge loops were not planar.

Now rather than finding the shortest distance between two vertices, one from
each edge loop and using that as a starting point, it now finds the smallest
sum of distances between all vertex pairs that would be connected.
 2012-08-22 14:27:06 +00:00