griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
42,411 Commits 1 Branch 0 Tags
529209ff832a8737ad26115d9cd7ff21fd5eb698
Commit Graph

42411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Sharybin
529209ff83 Added Map Taper option which if enabled maps affect of taper object on 
actually beveled part of curve (previously affect of taper would have
been clamped by start/end bevel factor)

Here's an illustration:
http://wiki.blender.org/uploads/5/5d/Blender2.65_CurveMapTaper.png
 2012-11-08 08:16:44 +00:00
Campbell Barton
09cce17d84 decimator - merge flags when collapsing edges / verts, so seams and edges draw flags are kept. 2012-11-08 07:06:08 +00:00
Campbell Barton
617a73c573 code cleanup: unused defines & some formatting. 2012-11-08 06:46:10 +00:00
Campbell Barton
b0e2218093 code cleanup: avoid doing multiplications within macro FTOCHAR() per pixel when applying brush color. 2012-11-08 06:44:14 +00:00
Mitchell Stokes
cb41fbef8e CMake: Since Audaspace now requires Boost, auto enable Boost if WITH_AUDASPACE is enabled. 2012-11-08 05:50:02 +00:00
Campbell Barton
718550878b minor cleanup to to selecting the shortest path, change some variable names and make edge/face modes share the cost calculation function. 2012-11-08 03:39:15 +00:00
Campbell Barton
9bdfb82f05 add mesh editmode Ctrl+RMB to select the shortest path between faces, works the same as for edges. 
Request from Kjartan.
 2012-11-08 03:19:21 +00:00
Campbell Barton
5b0ee040a3 further cleanup for selecting the shortest path, remove the need for EDBM_index_arrays_* functions. 2012-11-08 02:33:26 +00:00
Campbell Barton
374238b7ef code improvements for selecting the shortest path for mesh editmode, 
this will give some speedup but its mainly to simplify the function.

- use bmesh adjacency data, was building its own data, left over from pre-bmesh.
- use a flag to store visited edges rather then a hash.
- store edge pointers in the heap rather then index values (was converting back and fourth a lot).
 2012-11-08 02:12:31 +00:00
Campbell Barton
a9132591e6 code cleanup: 
linearrgb_to_srgb_ushort4_predivide() was calling `linearrgb_to_srgb(t) * alpha` twice in the FTOUSHORT macro, which gcc didn't optimize out.
 2012-11-07 23:55:52 +00:00
Campbell Barton
353ad46e10 code cleanup: quiet double promotion warnings 2012-11-07 23:52:33 +00:00
Campbell Barton
c0fb605a04 fix [#26472] Decimate overlaps polygons 2012-11-07 22:39:47 +00:00
Campbell Barton
620a78c106 decimate - degenerate edges are now added back into the heap (with an dummy cost), so when surrounding geometry may be modified and the previously degenerate edge re-evaluated after. 
The C++ LOD decimator did this too.
 2012-11-07 22:28:50 +00:00
Jens Verwiebe
aa42934cef itask: reworked conditionals for osx version compatibility 2012-11-07 21:19:43 +00:00
Brecht Van Lommel
204113b791 Fix #33107: cycles fixed threads 1 was still having two cores do work, 
because main thread works as well.
 2012-11-07 21:00:49 +00:00
Daniel Genrich
b51908b913 Bugfix [#32939] Fluid sim reversed on X and Y with animated Control object 
Bug was introduced in r48531 by accident since fluid control object abuse a variable for another flag which got reset.
 2012-11-07 18:11:13 +00:00
Bastien Montagne
3e004d3043 Use CMAKE_LIBRARY_ARCHITECTURE instead of hardcoded stuff like x86_64-linux-gnu! Now should work with any multiarch! 2012-11-07 16:51:09 +00:00
Brecht Van Lommel
b27a6c6b0d Fix #33114: crash with render frame update script and GLSL. 2012-11-07 16:27:18 +00:00
Ton Roosendaal
043efbc464 Bugfix #32806 
Two fixes for NDOF device:

- RNA item for setting turntable or trackball for ndof was using wrong variable
- Some moment the option "rotate around selection" stopped to work for ndof.

Note: the latter option doesn't do dolly in, use shift+ndof for that.
 2012-11-07 16:18:20 +00:00
Bastien Montagne
01200ca2ac UI message fixes... 2012-11-07 14:56:53 +00:00
Campbell Barton
34fecdd60e code cleanup: use min/max functions rather then macros. 2012-11-07 12:31:05 +00:00
Bastien Montagne
5850e62262 Attempt to fix problems with local built py caused by own r51976. 2012-11-07 12:24:03 +00:00
Bastien Montagne
d8443cdfb0 New words... 2012-11-07 12:14:35 +00:00
Jens Verwiebe
d7fe02936b Fix ITASK warnings 2012-11-07 11:57:51 +00:00
Bastien Montagne
fff3f95768 Update to make it work with new debian-like py3.3 packages. A bit hackish (this arch-dependent stuff makes things a bit complex), and probably only working for amd64 arch, but at least should not create any regression... 2012-11-07 11:44:39 +00:00
Sergey Sharybin
9a365d061f Motion Tracker: disable stabilization operators when active object is not a camera 2012-11-07 11:41:08 +00:00
Campbell Barton
14dea2c5bf fix for own error in recent orig-index refactor (reported as [#33112]) 2012-11-07 11:37:53 +00:00
Sergey Sharybin
73d83fd99b Affine tracker do_versions were missed for objects tracs 
Run this code again, so files from 2.63 would be opened correct now.
 2012-11-07 11:32:57 +00:00
Campbell Barton
f6c159654f prevent floating point exceptions from being raised in soft_range_round_up/soft_range_round_down(), caused by log(0). 2012-11-07 11:28:50 +00:00
Campbell Barton
a10ed84bf4 fix [#33094] Even edge slide on multiple loops destroys geometry 2012-11-07 11:19:54 +00:00
Sergey Sharybin
1c450d71ef Fixed crashes when motion tracks are zero-sized 
This is probably versioning issue happened when both trunk and tomato
were mixed to work on the same file.

Anyway, there're few files here locally and it's probably other users
do have the same files, so lets keep things safe here :)
 2012-11-07 11:18:42 +00:00
Jens Verwiebe
552c0e74f4 Fix a typo and more descriptve commet 2012-11-07 10:52:07 +00:00
Jens Verwiebe
a68416e681 OSX: some more version target cleanups and corrections 2012-11-07 10:43:31 +00:00
Sergey Sharybin
53ede28fcb Invalidate sequencer cache when movie clip's input color space is changing 
Currently the only way is to invalidate the whole cache, for something
smarter we'll need a dependency graph which would be able to deal with
relations between clip and strip.
 2012-11-07 10:18:11 +00:00
Campbell Barton
f727448e10 fix [#33106] Decimate modifier/collapse give bad result 
FLT_EPSILON was too small to use when checking if the edge collapse result is an error.

add invert_m3_m3_ex(), invert_m3_ex() functiosn which take an epsilon to check the determinant, saves calculating it twice per edge collapse.
 2012-11-07 09:28:59 +00:00
Campbell Barton
efc44d0c4d decimator - interpolate vertex normals rather then re-calculating them. faster and means degenerate faces wont explode. 2012-11-07 07:16:28 +00:00
Campbell Barton
be367890f7 decimator - no need to check abs() on normal length. 2012-11-07 06:28:46 +00:00
Campbell Barton
8740b6cd88 fix [#33108] Running save_as_mainfile breaks relative texture paths 
save-as with path remapping left the paths relate to the file written.
 2012-11-07 04:13:03 +00:00
Campbell Barton
cdce3e0949 code cleanup: 
- remove double promotions
- use UI_DPI_ICON_FAC macro rather then dpi/72
- add assert to prevent creating jobs with WM_JOB_TYPE_ANY, which should only be used for finding jobs.
 2012-11-07 01:32:15 +00:00
Campbell Barton
852a41fb0e style cleanup, also remove redundant call to set_listbasepointers in free_main(). 2012-11-07 01:02:28 +00:00
Campbell Barton
5cf9d5e4ca for utility checkers, use QUIET env var, not to print progress. 2012-11-07 01:00:27 +00:00
Dalai Felinto
0890c2a4a0 support for string parameters in OSL nodes 
for now subtype is not defined, but once we start parsing the metadata we can set texture inputs as FILEPATH
also, it takes relative strings and convert to absolute for all strings (which is arguably a good solution, but
should work for now)
 2012-11-06 21:36:44 +00:00
Brecht Van Lommel
d68981158b Fix cycles crash with normal map node, issue with tangent sign attribute. 2012-11-06 21:27:59 +00:00
Brecht Van Lommel
4496b9004c Cycles: tangent and normal map now show UV map link menu instead of text field. 2012-11-06 20:48:26 +00:00
Andrea Weikert
ecda79a8b8 == file browser == 
[#33080] Backup icons - further integration
Contributed by Georg Kronthaler, many thanks!

* enables display of correct file icon on splash screen and in Open Recent menu
* exposes filter_backup in the python api
* enables setting BLENDERFILE_BACKUP as active filter in file browser from wm_operators.c (and from .blend in case this setting will be saved in the future)
* adds a comment to slightly misleading function name file_is_blend_backup()
* Updates icon for backup files to be more consistent with icon for .blend files
 2012-11-06 20:29:14 +00:00
Brecht Van Lommel
0ba9e04c5b Fix for previous commit, didn't compile on windows. 2012-11-06 20:19:20 +00:00
Brecht Van Lommel
3e9f2938f0 Cycles OSL: support for the trace(point pos, vector dir, ...) function, to trace 
rays from the OSL shader. The "shade" parameter is not supported currently, but
attributes can be retrieved from the object that was hit using the
getmessage("trace", ..) function.

As mentioned in the OSL specification, this function can't be used instead of
lighting, the main purpose is to allow shaders to "probe" nearby geometry, for
example to apply a projected texture that can be blocked by geometry, apply
more “wear” to exposed geometry, or make other ambient occlusion-like effects.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/OSL#Trace

Example .blend and render:
http://www.pasteall.org/blend/17347
http://www.pasteall.org/pic/show.php?id=40066
 2012-11-06 19:59:10 +00:00
Brecht Van Lommel
209cd25745 Cycles OSL: phong_ramp(N, exponent, colors[8]) closure added, which works like 
a specular ramp shader. Note this is OSL only still, for experimenting.

Patch by Thomas.
 2012-11-06 19:59:07 +00:00
Brecht Van Lommel
27d647dcf8 Cycles: 4 new nodes. 
* Tangent: generate a tangent direction for anisotropic shading. Can be either
  radial around X/Y/Z axis, or from a UV map. The default tangent for the
  anisotropic BSDF and geometry node is now always radial Z, for UV tangent use
  this node now.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Tangent

* Normal Map: generate a perturbed normal from an RGB normal map image. This
  is usually chained with an Image Texture node in the color input, to specify
  the normal map image. For tangent space normal maps, the UV coordinates for
  the image must match, and the image texture should be set to Non-Color mode
  to give correct results.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Normal_Map

* Refraction BSDF: for best results this node should be considered as a building
  block and not be used on its own, but rather mixed with a glossy node using a
  fresnel type factor. Otherwise it will give quite dark results at the edges for
  glossy refraction.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Refraction

* Ambient Occlusion: controls the amount of AO a surface receives, rather than
  having just a global factor in the world. Note that this outputs a shader and
  not a color, that's for another time.

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Ambient_Occlusion
 2012-11-06 19:59:02 +00:00
Brecht Van Lommel
ccffb6811c Cycles: disable OpenCL in builds for now, since it's not working and is only 
confusing users at this point. For experiments you can define the
CYCLES_OPENCL_TEST environment variable to make it show up in the UI.
 2012-11-06 19:58:51 +00:00