kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
41,470 Commits 2 Branches 0 Tags 753 MiB
592f80625b
Commit Graph

2590 Commits

Author SHA1 Message Date
Sergey Sharybin
ef107d1a4d Color Management: fallback to stub ocio implementation in cases when 
ocio configuration file failed to load

This solves issues with infinite NULL-checks to prevent crashes in
such situations. Currently only happens if there's no configuration
file at all, but could be tweaked further to fallback if this file
isn't usable by blender.
 2012-10-04 13:39:08 +00:00
Campbell Barton
dc8340fa33 correct some include dirs not being included as SYSTEM paths in cmake. 2012-10-02 03:18:48 +00:00
Brecht Van Lommel
b1f1ee5138 Fix/workaround #31987: sample as lamp for environment textures not working 
with multi GPU when resolution > 128.
 2012-10-01 18:31:32 +00:00
Brecht Van Lommel
02fc3eb56c Fix #32725: cycles border render + panorama camera not working in viewport. It will 
still look a bit strange since the viewport can't actually render such panorama views,
so the opengl drawn scene behind the border render will not match up.
 2012-10-01 17:09:12 +00:00
Thomas Dinges
b012c3cf46 Cycles UI Tweak: 
* Don't disable Progressive option, just grey out.
 2012-09-29 23:45:35 +00:00
Brecht Van Lommel
71195b247e Fix #32072: cycles shadow pass gave different results with/without emitting 
materials present, even though it's only taking lamp shadows into account.
 2012-09-28 13:41:34 +00:00
Brecht Van Lommel
1d2e59ba1c Fix cycles "synchronizing object" status being shown when it was already finished. 2012-09-28 12:37:20 +00:00
Campbell Barton
589ada7f0c code cleanup: correct spelling 2012-09-28 06:45:20 +00:00
Brecht Van Lommel
46d82a2a12 Fix #32618: cycles multithreaded image loading could crash with CUDA, was a 
threading issue that happens once every X frames.
 2012-09-27 17:42:09 +00:00
Campbell Barton
8a51d235e6 pep8 cleanup 2012-09-26 21:19:51 +00:00
Campbell Barton
483a6cd6c2 fix for cycles/python script error in normal panel 2012-09-26 19:23:06 +00:00
Sergey Sharybin
c9d4956f45 Color Management: restore abort() in cases of error and WITH_ASSERT_ABORT enabled 2012-09-26 13:21:10 +00:00
Sergey Sharybin
f45f229af2 Use ${OPENEXR_INCLUDE_DIR} instead of ${OPENEXR}/include 
There's no CMake symbol names ${OPENEXR} which lead to using /include
as an include directory, which isn't correct.
 2012-09-25 07:34:45 +00:00
Jens Verwiebe
87a8aea313 OSL/cmake: the non-intrusive parts, so other os-maintainers can take code over 2012-09-24 19:06:28 +00:00
Brecht Van Lommel
ae7c3eaceb Fix #32638: mesh double sided normals option not available in any Cycles panel. 2012-09-24 14:36:20 +00:00
Campbell Barton
3e6340214d fix for incorrect declaration rna_Object_free_duplilist() in cycles. 2012-09-23 05:02:06 +00:00
Campbell Barton
34114b3b75 code cleanup: remove/comment unused defines 2012-09-22 13:40:31 +00:00
Campbell Barton
1541ee20c8 Improvement to own commit r50810. 
Add an optional ghost argument to set the new mouse location when un-grabbing. - without this the mouse would flicker at the old location before moving to the new location - when using the color picker for eg.
 2012-09-22 13:23:12 +00:00
Thomas Dinges
c39ac85899 Cycles: 
* Change Addons Link to point to the manual instead of the dev documentation. 
* Add sm_30 to Linux build configuration.
 2012-09-21 17:53:52 +00:00
Thomas Dinges
fad952f423 * Fix for r50782, new "Geometry Data" Panel was missing in Cycles. 2012-09-21 13:56:10 +00:00
Thomas Dinges
b170eda2d6 Cycles UI: 
* Followup for r50550, added checks to the "Samples" Button in World and Lamp Context to properly show the correct options.
 2012-09-21 13:32:52 +00:00
Sergey Sharybin
a4f73c5694 Fix #32579: Sequencer crash when changing render dimensions 
Memory limitor's queue could be affected when it's being iterated
on enforcing limits -- that's because iteration could free color
managed image buffers.

Fixed by getting least priority element after every element was
freed. Could be optimized a bit, but it anyway shouldn't be so
slow due to specific of cache limiting and limit enforcing finish
condition.
 2012-09-20 12:59:16 +00:00
Campbell Barton
fbe13ab84a style cleanup 2012-09-20 12:29:28 +00:00
Campbell Barton
b0c7c8756f code cleanup: cycles now uses system includes for boost/oiio.. etc, so we dont get warnings from system headers. 2012-09-20 09:04:43 +00:00
Campbell Barton
bc69b3a8df style cleanup 2012-09-20 01:32:13 +00:00
Campbell Barton
25c96bc9f3 code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc 2012-09-20 01:02:39 +00:00
Campbell Barton
5d56a901a8 code cleanup: c++ - use empty() rather than size(), use prefix operators for non-primitive types - recommended for non primitive types. 2012-09-20 00:55:32 +00:00
Brecht Van Lommel
51eed03e94 Fix #31888: cycles crashes using movie for image texture. This is not supported 
but should not crash either. This fix is more of a workaround, the crash seems
to be in openimageio or one of the libraries it uses.
 2012-09-19 23:55:12 +00:00
Brecht Van Lommel
2e80d9ccc0 Fix #32018: non-progressive integrator crash. 2012-09-19 17:09:11 +00:00
Sergey Sharybin
d0f4c96394 Color Management: don't apply display transform on Non-Color images 
Also don't color manage data buffers in texture painting.

Makes it possible to view heights and normal maps in proper space
and also paint on them without applying extra transformation.
 2012-09-19 15:01:36 +00:00
Brecht Van Lommel
22fdc63b86 Color management: fix crashes and memory leaks when using custom OCIO configuration 
Also fix some missing color spaces when loading some OCIO configurations, by falling
back to scene linear if role is not found. There can still be some errors in the
console, need to check this further.

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management#OpenColorIO_Configuration
 2012-09-18 19:20:26 +00:00
Campbell Barton
a4ff2b9140 code cleanup: warnings 2012-09-18 03:15:12 +00:00
Campbell Barton
f6251a1f32 code cleanup: warning and style 2012-09-17 22:34:42 +00:00
Lukas Toenne
efaf512406 Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices." 
This commit leads to random freezes in Cycles rendering:
https://projects.blender.org/tracker/index.php?func=detail&aid=32545&group_id=9&atid=498

The goal of this commit was to remove UI lag for OSL, but since that is not officially supported yet, better revert it until a proper fix can be implemented in 2.65.
 2012-09-17 12:07:06 +00:00
Brecht Van Lommel
3f3fec37e5 Fix cycles panorama camera not working with depth of field, patch by 
Daniel M. Basso, thanks!
 2012-09-17 11:25:29 +00:00
Brecht Van Lommel
89eeae955b Cycles: change preview "resolution divider" that gave the number of lower 
resolutions to render, to a "start resolution" which gives the resolution
to start at.

This avoids unnecessary rendering of small resolutions in small viewports,
and avoids long waiting on big viewports.
 2012-09-17 10:55:18 +00:00
Sergey Sharybin
fc7de23537 Color Management: fix crash when displaying render preview if OCIO was disabled buildtime 2012-09-16 15:17:22 +00:00
Lukas Toenne
acb2c7e0d1 OSL Fix for fireflies in velvet bsdf, ported over from SVM fix in r41738. 2012-09-16 13:17:39 +00:00
Sergey Sharybin
7f1cfbfff5 Fix some warnings treated as errors here. 2012-09-16 12:33:39 +00:00
Campbell Barton
e84b300d9e use the format attribute in more places, disable X11 options when building with GHOST_SDL 2012-09-16 10:39:19 +00:00
Campbell Barton
2fb8292005 style cleanup 2012-09-16 04:58:18 +00:00
Campbell Barton
c2a1dcf621 fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake. 2012-09-16 01:35:00 +00:00
Campbell Barton
d724d0adfe code cleanup: quiet warnings for gcc's -Wundef, -Wmissing-declarations 2012-09-16 00:26:36 +00:00
Campbell Barton
2d6839ce65 code cleanup: remove unused structs and also some style cleanup. 2012-09-15 23:13:24 +00:00
Campbell Barton
518c80fc94 remove unused parts of raskter module. 2012-09-15 23:05:34 +00:00
Lukas Toenne
d9788e4fa4 Yet another OSL fix: Some functions are missing stubs that were not used in old OSL implementation yet. 2012-09-15 18:08:51 +00:00
Lukas Toenne
f4b7a8a545 Fix for OSL 'Normal' node: the Direction parameter is of 'normal' type instead of generic 'vector'. 2012-09-15 16:31:11 +00:00
Lukas Toenne
41081b3e8c Generate compatible OSL shader parameter names in cases where the node has and input and output with the same name. In that case the convention is to add suffixes "In" and "Out" respectively. 
Example:

Blender node has one input "Color" and one output "Color"

-> OSL parameter names should be "ColorIn" and "ColorOut"
 2012-09-15 16:31:07 +00:00
Lukas Toenne
21964e6538 OSL implementation of RGB ramp node. 
The sampled color ramp data is passed to OSL as a color array. This has to be done as actual float[3] array though, since the Cycles float3 type actually contains 4 floats, leading to shifting color components in the array.

Additional parameter set functions for arrays have been added to the Cycles OSL interface for this purpose.
 2012-09-15 15:41:37 +00:00
Thomas Dinges
b6fd8ae97a Cycles / OSL: 
* Fix Musgrave Texture, used wrong Perlin Noise (0..1) instead of -1..1. Also added comment to noise_basis() to make it clear which noise type is used there.
 2012-09-15 15:03:43 +00:00