Revision c561923 by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 18, 2018, 02:22 (GMT) |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr Conflicts: source/tools |
June 17, 2018, 20:37 (GMT) |
Fix color parametrization ordering |
Revision a0c8cf8 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 18:14 (GMT) |
Make properties not animatable These properties must not use the icon to animate property. |
June 17, 2018, 17:49 (GMT) |
Merge branch 'greasepencil-object' into temp-greasepencil-object-stacksplit Conflicts: source/blender/blenkernel/BKE_gpencil.h source/blender/blenkernel/intern/gpencil_modifier.c source/blender/blenloader/intern/readfile.c source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c source/blender/makesdna/DNA_modifier_types.h |
Revision 8eeb857 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 17:43 (GMT) |
Fix merge error in Topbar This errors broke the topbar |
June 17, 2018, 16:02 (GMT) |
Automagically get a RNG even if the user doesn't socket Random Note that, after this change, **only setting Randomization to 0 will disable it**. |
Revision f1daff2 by Campbell Barton (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 15:12 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 67747dc by Campbell Barton (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 14:57 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 687d248 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 14:24 (GMT) |
UI: Changes in sculpt brush panel * The direction is not expanded because enabling Expand=True rises an Assert. |
Revision 0883e0c by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 14:18 (GMT) |
Add default icons for direction |
June 17, 2018, 13:25 (GMT) |
Amend OSL shader again to account for parameter renaming |
June 17, 2018, 11:39 (GMT) |
Fix typo errors |
June 17, 2018, 11:05 (GMT) |
Merge branch 'greasepencil-object' into temp-greasepencil-object-stacksplit |
Revision 1cf1ff1 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 17, 2018, 10:55 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
June 17, 2018, 01:23 (GMT) |
Amend OSL shader w.r.t. Melanin changes |
June 17, 2018, 01:06 (GMT) |
Refactor Melanin into Tungsten's quantity and ratio parameters |
June 16, 2018, 22:20 (GMT) |
Remap randomization to roughness/color � the given percentage factor |
June 16, 2018, 21:00 (GMT) |
Reorder sockets according to usefulness |
June 16, 2018, 20:42 (GMT) |
Remove two possible sources of NaNs |
Revision 1902d38 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 16, 2018, 17:51 (GMT) |
Fix changes after merge |
|