Revision dc422dc by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 12, 2018, 13:40 (GMT) |
PEP8 Style |
Revision 7d0ad0d by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 12, 2018, 13:38 (GMT) |
UI: Check if the material has gpencil data to show panel |
Revision ce5ecd1 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 12, 2018, 11:56 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/editors/include/ED_object.h source/blender/editors/object/object_modifier.c |
Revision 3721b85 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 12, 2018, 11:39 (GMT) |
GP Branch: Update gpl->actframe in depsgraph callbacks (fixes COW-related issues) This commit fixes various problems across the codebase caused by the fact that the gpl->actframe pointers no longer get updated on redraw, meaning that various editing tools were not working. Applying a similar solution to 59a516913e599ce29754d361246a0d8cb92bd314 here: On the exit node for GP data evaluation, we flush the changed actframe pointers back to main database, so that the main db is consistent with the displayed time. Notes: - For now, we just reuse the BKE_gpencil_eval_geometry() callback, since it's the only one there and nothing else was happening there. In future, when we do convert the GP modifier stack evaluation away from its drawing-engine based approach, we should split this out into its own function. - We also do the actframe update in the COW domain here. While it's not strictly needed for anything right now, this is something that should really have been happening, so let's do it the proper way now. - The alternative approach would've been to modify all GP related context functions to set this whenever they were called. But that carries performance penalties, and isn't such a nice solution, as context getters should really not have side-effects. |
Revision d69ac37 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 12, 2018, 10:49 (GMT) |
Fixes after merge Some parameter list change. Also disabled some functions that will not be used in annotations. Keep the function as reference to be removed when annotation will be back. |
Revision e9964ed by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 12, 2018, 10:40 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision d3f35b5 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 15:55 (GMT) |
Add comments to review context creation in render |
Revision 3bacfa0 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 15:54 (GMT) |
Add missing parameter after merge |
Revision d296a84 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 15:41 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/space_view3d.py |
Revision e00948e by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 14:00 (GMT) |
Fix errors after merge |
Revision 7dbdd96 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 13:51 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/blenkernel/intern/object_update.c |
Revision d3ba4b3 by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 11, 2018, 10:22 (GMT) |
depth behave weird, fixed multisample on snake result. |
Revision 3faa0e6 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 09:38 (GMT) |
Fix segment fault in weight paint for 2.8 old files This code would be moved to versioning code after merge, but now it's required to manage files created with previous versions of 2.8 (not 2.7x) |
Revision e98b9d3 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 09:27 (GMT) |
Remove mode switching custom code This code is not required because the mode switching is not done with keys 1..9 |
Revision 4a63d0c by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 11, 2018, 07:02 (GMT) |
added depth-alpha line style control (pre multiply) |
Revision 67cfa73 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 11, 2018, 06:55 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision d64862f by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 11, 2018, 06:02 (GMT) |
Add: depth controlled line width. |
Revision 711c3f5 by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 11, 2018, 02:38 (GMT) |
Added multisampe support functions in DRW. transform_to_screen later. |
Revision 2882363 by Nick Wu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) June 11, 2018, 01:54 (GMT) |
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr Conflicts: source/tools |
Revision 98021bd by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 10, 2018, 18:56 (GMT) |
Move multisample textures to texture list If the texture is in e_data is shared for all viewports and fails. |
|