griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
70,270 Commits 1 Branch 0 Tags
cb554981594cd734f877a2ff78daec6622ecee83
Commit Graph

70270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sybren A. Stüvel
cb55498159 Merge branch 'master' into blender2.8 2017-07-05 22:25:05 +02:00
Sybren A. Stüvel
aea4456101 Better fix for sequencer crash when text strip doesn't have effect data. 
This situation happens when a file with a text effect sequencer strip is
loaded in Blender < 2.76 and saved. This destroys the effect data, causing
a crash in Blender ≥ 2.76.

d2f748a222 prevented the crash when opening such a file, but accessing
the strip still caused a crash. This commit fixes that by actually
initialising the invalid strip. Of course this still causes data loss, but
that already happened by opening & overwriting the file in Blender < 2.76.
 2017-07-05 22:18:41 +02:00
Clément Foucault
91808a67e8 Eevee: Volumetrics: Fix enum flag. 2017-07-05 22:17:09 +02:00
Sergey Sharybin
31f8ca5034 Cycles: Fix compilation error after recent logging changes 
This file uses std::ostream for helper << operators, so need to make sure
corresponding header is included.
 2017-07-05 20:40:55 +02:00
Sybren A. Stüvel
d2f748a222 Sequencer: Prevent crash when text strip doesn't have effect data. 2017-07-05 20:22:28 +02:00
Clément Foucault
7b565c8a76 Eevee: Fix typo... 2017-07-05 19:57:02 +02:00
Dalai Felinto
5495f89cf6 Fix User Interface for Volumetric 2017-07-05 19:23:57 +02:00
Clément Foucault
c62f82e35b Eevee: Fixups. 
Fix float promotion and missing layer parameters.
 2017-07-05 19:15:32 +02:00
Clément Foucault
f6c739cbcd Eevee: Volumetrics: Add Light contribution clamping. 
This avoid too much variance at light centers and remove some noise.
 2017-07-05 19:14:50 +02:00
Clément Foucault
031a4d5e22 Eevee: Volumetrics: Do not add anisotropy attribute, average it. 
This makes no sense to add theses. In cycles, each volume node is computed separatly. In eevee only the combined parameters are evaluated and phase should be averaged in this case.
 2017-07-05 18:31:43 +02:00
Clément Foucault
b5ee6dd9a3 DrawManager: Fix manipulator blend mode. 
This was giving issue with volumetrics.
 2017-07-05 18:29:40 +02:00
Clément Foucault
291b365e26 Eevee: Volumetrics: Add settings. 2017-07-05 18:28:48 +02:00
Clément Foucault
8b78a8d9bc Eevee: Volumetrics: Add support for Position Coordinates. 
This enables texturing of the noise via procedural or baked textures.
Note that it gets quickly really heavy.
 2017-07-05 18:21:06 +02:00
Clément Foucault
f8aab24fb5 Eevee: Volumetrics: Add Volume Absorption node. 2017-07-05 18:21:06 +02:00
Clément Foucault
d5448eac6c Eevee: Volumetrics: Colored Transmittance support. 
Render the transmittance in another color buffer and apply it separatelly.
It's a bit more slow because the upsample step needs to be done twice.
 2017-07-05 18:20:19 +02:00
Clément Foucault
ed4e62997e Eevee: Volumetrics: Match cycles scattering. 2017-07-05 18:03:36 +02:00
Dalai Felinto
971ecfa721 Eevee: Move volumetric to its own panel, new settings to come 2017-07-05 17:58:27 +02:00
Dalai Felinto
6de28e7f90 Override template: Add text and icon optional parameters 2017-07-05 17:58:27 +02:00
Dalai Felinto
eb48eeba84 Expose rna_translate_ui_text to be used for interface templates 2017-07-05 17:58:27 +02:00
Luca Rood
5e9ad8065a Code comments regarding last commit (forgotten to add before) 
Using an arbitrary face as the source of the UV data is mostly fine, as
vertices on seams will generally map to different parts of the texture
that have the same color.

This is regarding fed853ea78
 2017-07-05 16:19:41 +02:00
Luca Rood
bdeeb29482 Merge branch 'master' into blender2.8 2017-07-05 15:50:01 +02:00
Luca Rood
fed853ea78 Fix T51296: UVs not working for hair emitted from vertices 2017-07-05 15:48:54 +02:00
Sergey Sharybin
e3bddcb215 Compositor: Fix compilation error and crash when using defocus search 
Was just wondering what the option is doing. Not sure yet, but let's fix
couple of issues here.
 2017-07-05 15:37:33 +02:00
Sergey Sharybin
d37dd97e45 Cycles: Pass string by const reference rather than by value 
Some of the functions might have been inlined, but others i don't see
how that was possible (don't think virtual functions can be inlined here).

In any case, better be explicitly optimal in the code.
 2017-07-05 12:27:41 +02:00
Sergey Sharybin
58c456b12d Cycles: Fix compilation error when building without Glog and no C++11 2017-07-05 12:01:12 +02:00
Bastien Montagne
f3764d51bd Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/space_view3d/drawobject.c
 2017-07-05 09:20:48 +02:00
Dalai Felinto
84d20dd227 Eevee: Fix world test for volumetric 
Compiler even throws a warning at this.
 2017-07-04 18:07:39 +02:00
Alexander Romanov
3898236b81 Third fix for my merge: crash after switch to edit mode reported by @dfelinto 2017-07-04 17:53:19 +03:00
Bastien Montagne
4d124418b7 Fix T51834: Active Object and Groups color difference imperceptible 
16 was not enough here, -32 seems to give OK results.
 2017-07-04 16:01:16 +02:00
Alexander Romanov
0ef48ad504 One more fix for merged 'normal map tangents not working correctly when there are no UV maps.' 2017-07-04 16:25:49 +03:00
Bastien Montagne
f23ed929ee Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/makesdna/DNA_particle_types.h
 2017-07-04 13:13:49 +02:00
Bastien Montagne
f86b43e130 Fix T51965: Custom Bone Shape Wireframe setting affects wireframe thickness. 
Clearing of custom bones outline's line thickness was not done at proper
point, wireframe drawing never changes line thickness, only solid draw
with outline does...
 2017-07-04 13:11:33 +02:00
Luca Rood
d1dfd5fa26 Fix T51703: Rigid body with delta transform jumps when transforming 
When doing any transformation on a rigid body object that has delta
transforms, the object would be offset by the amount of the delta
transform.
 2017-07-04 12:27:21 +02:00
Clément Foucault
fc8f6e8f7a Eevee: Fix Closure define. 2017-07-04 11:40:12 +02:00
Luca Rood
b87d10d4fe Better fix for rigid body not resimulating 
Last fix only accounted for direct changes to the RB settings, but
failed for, say, object transformations. This fix accounts for any
change that might invalidate the RB cache.
 2017-07-04 10:57:57 +02:00
Luca Rood
3edc8c1f9b Fix rigid body not resimulating after cache invalidation 
Fix 9cd6b03187 introduced a bug that
prevented simulation after a cache invalidation (for instance when
changing a setting after simulating). This fixes that.
 2017-07-04 09:22:42 +02:00
Clément Foucault
b09052002c Eevee: Add support for volumetrics in node tree. 
Only volume scatter is implemented for now.
 2017-07-03 22:08:33 +02:00
Clément Foucault
2eef097831 GPU Codegen: Add new closure socket type. 
This allow specialized shaders to redefine the closure interface to fit their needs.

For instance, Volumetric closure needs to pass more than one vec4 (absorption vec3, scattering vec3, anisotropy float).
 2017-07-03 22:08:33 +02:00
Clément Foucault
65b01014b9 Eevee: Initial implementation of Volumetrics. 2017-07-03 22:08:33 +02:00
Clément Foucault
9d2ee7998a Draw Manager: Add new blend mode for transmission. 
This blend Mode is doing  Source + Destination * Alpha.
 2017-07-03 22:08:33 +02:00
Clément Foucault
9b66a320bf Eevee: Fix luma calculation for lamp fresnel. 2017-07-03 22:08:33 +02:00
Dalai Felinto
e571e6d60e Fix edit mode not drawing 
This was introduced on 1ad0cc6bde.
 2017-07-03 21:48:39 +02:00
Dalai Felinto
3eeac771d0 Fix alembic after merge from master 2017-07-03 21:16:34 +02:00
Dalai Felinto
3fc342bda0 Fix building with gcc6 after merge from master 2017-07-03 21:16:34 +02:00
Alexander Romanov
de2faa395f Fix for merged 'normal map tangents not working correctly when there are no UV maps.' 2017-07-03 20:13:52 +03:00
Alexander Romanov
e1482841dd Merge branch 'master' into blender2.8 2017-07-03 19:53:00 +03:00
Lukas Stockner
15fd758bd6 Fix T51950: Abnormally long Cycles OpenCL GPU render times with certain panoramic camera settings 
The problem here was that when a "invalid" path is generated by the panoramic camera, it was tagged
as RAY_TO_REGENERATE with the intention of generating a new path in kernel_buffer_update.

However, since that state was not handled in kernel_queue_enqueue, kernel_buffer_update did not
process the path which resulted in an infinite loop.
 2017-07-03 18:26:19 +02:00
Lukas Stockner
6782a6076c Cycles: Add missing split kernel to CPUDevice 2017-07-03 18:26:18 +02:00
Luca Rood
56422ff6c3 Fix T51523: Lattice modifier affecting particles even when disabled 
Particles were ignoring the lattice modifier visibility, and
"influence" property.
 2017-07-03 18:00:13 +02:00
Dalai Felinto
1ad0cc6bde Eevee: Hide lightprobe data when using "Only Render" 2017-07-03 16:16:24 +02:00