Revision d809346 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 20:31 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/__init__.py source/blender/editors/object/object_add.c source/blender/editors/object/object_intern.h source/blender/editors/object/object_ops.c source/blender/editors/space_buttons/space_buttons.c source/blender/makesrna/intern/rna_internal.h |
Revision 82a2bb2 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 20:22 (GMT) |
Enable Onion with Overlay button The grease pencil onion skin need to set the cache as dirty to recalculate geometry, so a depsgraph recalc must be done when change Overlay switch. |
Revision 55f0173 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 18:54 (GMT) |
Undo hide Onion with overlay There is a problem with the cache update and need a refactor. Remove the code while found a solution. |
Revision 64abbdc by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 14:59 (GMT) |
UI: remove Edit Lines color from Overlay panel |
Revision 2af322f by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 14:55 (GMT) |
UI: Back Selected Mask options to Topbar These options aren't overlays. |
Revision 375dcdd by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 14:41 (GMT) |
UI: Add Edit LIne Color to Overlay |
Revision be13808 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 14:40 (GMT) |
Disable Onion y Edit lines with Overlay flag |
Revision 8565fb5 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 14:36 (GMT) |
UI: Move some options to overlay (Edit lines, Onion) |
Revision ed5c6da by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 13:57 (GMT) |
Disable Grease Pencil Paper when disable overlays |
Revision 974f2b6 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 13:37 (GMT) |
U: Show grease pencil paper options in any GP mode |
Revision cf2a929 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 11:59 (GMT) |
UI: Recover Pivot Point selector After a merge, the pivot point disappear en Edit and Sculpt mode |
Revision 4953892 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 09:06 (GMT) |
Check Weight data is available before duplicate or use This is needed for using the functions in annotations where the weight data is not created |
Revision 86f0549 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 08:23 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision b5dfb62 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 07:30 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/makesrna/intern/rna_gpencil.c |
Revision ca3cd8f by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) July 6, 2018, 06:46 (GMT) |
New Shader FX implementation This is the new implementation of the old VFX modifiers. - All the BKE functions have been separated in new module and a new listbase was added to Object struct. Now the modifiers and the new shader FX are totally separated. - Added a new section in properties panel for FX. ToDo: New Icon. - Drawing methods improved aand new Rim and Colorize FX created. Some functions and code (glsl and DRW_*) could be shared by other modules in the future, but as today only grease pencil is using it and the logic depend of the drawing engine, we decided to keep inside the GPencil drawing engine. |
Revision efc08aa by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 17:39 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 2c19f29 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 15:54 (GMT) |
Fix: Icons for annotation tools now show in toolbar |
Revision 4eefe33 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 15:44 (GMT) |
Icons for Grease Pencil/Annotation tools These were in the icon_geom.blend file in SVN (lib/resources), but needed to be manually added to the Export group for this to work. They are needed for use for use with the annotation tools. NOTE: There are currently problems running the icon generation scripts in the gp-object branch due to some file loading pointer remapping problems there causing segfaults when running the script. Thus, I generated these icons using the 2.8 branch, then cherry-picked that commit over to this branch. |
Revision b643f32 by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 12:38 (GMT) |
Fixes for incorrect version patching code introduced in b6776304e76a * newlibadr() shouldn't be called from direct_link_* functions Besides, the pointers in question get corrected in lib_link_material() already * Added expand_doit() calls for the sima and ima pointers. Following what's done for tex->ima, these also get expand_doit() calls, since they increase the usercount of images when used. |
Revision 4b64b7e by Joshua Leung (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-vfx) July 5, 2018, 12:38 (GMT) |
Cleanup: Remove the obsolete "ts->gp_brushes" field This isn't used or accessed from anywhere anymore, so time to remove it |
|