Revision 05e5a72 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) May 9, 2018, 14:23 (GMT) |
Fix segment fault for modifiers with COW enabled The curves in copyData was freed, but the pointer was not set to NULL. |
Revision 8e46049 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 9, 2018, 13:23 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 52cf83d by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 9, 2018, 13:10 (GMT) |
UI: Move "Move to Color" and "Select Strokes" operators from popup menu into the UI proper This brings the GP materials UI more into line with the standard object materials UI |
Revision 641eac4 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 9, 2018, 12:43 (GMT) |
Cleanup: Remove unused code (was from when we still used palette colors) |
Revision 5f6ade5 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 9, 2018, 12:24 (GMT) |
Fix: Don't show panels/complain if material doesn't have GP material settings |
Revision 6674a75 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 9, 2018, 12:24 (GMT) |
Cleanup: Remove old cruft |
Revision 5feb831 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) May 9, 2018, 12:07 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/properties_scene.py |
Revision 96e759d 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) May 9, 2018, 08:04 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 5484a03 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) May 9, 2018, 07:21 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision ed5c95f by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 17:36 (GMT) |
Cleanup: Remove "colorname" from GPStroke.new() This isn't used now, so remove it to silence the compiler warnings here |
Revision ca8b80c by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 17:12 (GMT) |
Fix compiler warnings after API changes in 2.8 |
Revision 4d506e9 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 17:07 (GMT) |
Merge branch 'blender2.8' into greasepencil-object # Conflicts: # source/blender/blenloader/intern/versioning_280.c # source/blender/editors/gpencil/gpencil_edit.c # source/blender/editors/gpencil/gpencil_paint.c # source/blender/editors/gpencil/gpencil_utils.c # source/blender/editors/object/object_transform.c |
Revision 74119ec 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) May 8, 2018, 16:15 (GMT) |
Remove VFX simplify option |
Revision f010d2e 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) May 8, 2018, 16:08 (GMT) |
Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object Conflicts: source/blender/draw/engines/gpencil/gpencil_engine.c |
Revision 6537ab8 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 15:56 (GMT) |
WIP: Temporary/placeholder commit to get compiling working Commented out all lines referring to vfx-related passes/buffers. (Antonio: Please revert this commit, then commit proper fixes for each of these lines) |
Revision 0b7cc11 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) May 8, 2018, 15:55 (GMT) |
Remove VFX (more cleanup) More changes to remove VFX modifiers and DOF. Removed some unused code not removed in previous commit. The temp texture A reused by general drawing has been enabled again (removed by error in previous commit) and renamed. Fixed some lines removed by error in previous commit. The modifer number in DNA_modifiers_types.h has been realigned to avoid any gap. This could produce some problems importing Hero files. Need check. |
Revision 904e16f by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 15:55 (GMT) |
More build fixes - Removing more lingering modifier/dof defines |
Revision da246cc by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 15:33 (GMT) |
More build fixes for VFX removal Still not building, but these should also be safe |
Revision 3e158b0 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) May 8, 2018, 14:28 (GMT) |
Remove VFX Modifiers + Defunct "DOF" Code * As per code reviews (see T54721 and T54769), it was decided that the "VFX Modifiers" should not be in the modifiers stack, as they are not really modifiers. Instead, they are more like placeholders for shader effects on the object. For now, we simply remove these from the code, with a view towards designing a more general solution for all object types in 2.8 in future (e.g. as a "Viewport Effects" tab or similar in the Properties Editor) * Also removed the "DOF" code. This was trying to copy what was done for Eevee, but the results were low quality, and the relevant code paths were already commented out. This code is also removed in this commit, as it depended a lot on many of the things put in place for the VFX modifiers, making removal of the VFX buffers complicated. Since it's not used now, it's not a big loss. Besides, with version control, we can bring this back in future. NOTE: Blender still doesn't compile - there are still too many extra buffers hanging around that need to be removed |
Revision 44a4ed9 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) May 8, 2018, 14:00 (GMT) |
Cleanup: Fix tabulation |
|