Revision d1130c5 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 29, 2018, 15:40 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/gpu/GPU_shader.h |
Revision c80bb33 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 29, 2018, 14:56 (GMT) |
Fix DOF render segment fault and use Eevee UI options To activate the DOF for grease pencil, the Eevee option is used as main flag. |
March 29, 2018, 12:27 (GMT) |
Merge branch 'blender2.8' into asset-engine Conflicts: source/blender/makesrna/intern/rna_ID.c |
Revision 67638e3 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 29, 2018, 08:27 (GMT) |
Merge branch 'greasepencil-object' into GP-DepthOfField |
Revision bbde146 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 29, 2018, 08:26 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 71bac9a by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 29, 2018, 08:23 (GMT) |
WIP: Fix alpha channel and replace by weights Still there is a problem with the external border. Thanks Cl�ment for the help. |
Revision 4f07ecb by Gaia Clary March 28, 2018, 18:54 (GMT) |
Refactor Collada: reorganized the BC classes for easier use * Made many changes to make the usage of the BCAnimationSampler much easier. * Reorganized the header files * renamed methods for better reading * Added Matrix typedef to replace float mat[4][4] * simplifdied the construction of BCSampleData entries * Added BCCamera BCLamp and BCMaterial classes * Added support for Camera xfov export * Added supprot for easier FCurve modifications through the BCAnimationCurve API * Added comments * Removed unnecessary code * Simplified code wherever possible |
Revision e4c6746 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 28, 2018, 17:59 (GMT) |
WIP: More work on shaders and framebuffers for DOF Still there are problems with the alpha factor and all the scene is empty because alpha is always 0. |
Revision 3e0f68e by Gaia Clary March 28, 2018, 17:24 (GMT) |
cleanup Collada: renamed method, removed not needed method * renamed get_matrices() to get_samples() Because the returned list no longer contains a set of matrices * removed is_flat() test method on BCSamples becasue it actually makes no sense here. |
Revision fbc1b12 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 28, 2018, 17:11 (GMT) |
Remove texture Free for DOF These textures are freed by draw manager and don't need explicit free. |
Revision db9244b by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 28, 2018, 17:06 (GMT) |
Fix wrong function to assign texture to shader |
Revision b8272f7 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 28, 2018, 16:09 (GMT) |
WIP: Start to add DOF support Still is not working. Save this commit as reference. |
Revision 544b700 by Gaia Clary March 28, 2018, 16:02 (GMT) |
Merge branch 'master' of git.blender.org:blender into collada |
Revision 96666d3 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 28, 2018, 06:54 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision c4b4719 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 27, 2018, 17:27 (GMT) |
Cleanup comments |
Revision 9e0674d by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 27, 2018, 17:11 (GMT) |
Cleanup shader code |
Revision 2f9f3d0 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 27, 2018, 16:03 (GMT) |
Fix alpha double blend The color when used alpha factor always got darker. The problem was a double blend that produced a reduction in the color saturation. Now, there is a premult of the alpha factor before doing last blend pass. As a result of this change, now the drawing process can be simplified and a pass can be removed. Some cleanup done too. Still need more work in render mode. Maybe the problem in render is related to Tonemapping. Thanks Cl�ment Foucault for his help solving this issue. |
Revision d7046c4 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 27, 2018, 08:47 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
March 26, 2018, 19:14 (GMT) |
just cleanup and minor bug fixes |
Revision 7bacfd3 by Antonio Vazquez (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) March 26, 2018, 15:46 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
|