Revision 7053b00 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 13, 2018, 14:07 (GMT) |
Cleanup: Remove unused struct These lines were used by old palette system. |
Revision 1ba5910 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 13, 2018, 14:04 (GMT) |
Cleanup: Create macros for duplicate code |
Revision d1260a0 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 13, 2018, 13:49 (GMT) |
Cleanup: Rename variables and comments |
Revision fa41009 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 13, 2018, 08:35 (GMT) |
UI: Hack topbar to keep all running while found final design These changes are only to keep running grease pencil with the last merge. All these UI elements must be relocated to the right place, but if we don't show them in the UI while we get the final place, the grease pencil is unusable. |
Revision 84d2d4e by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 13, 2018, 06:40 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/space_topbar.py |
Revision 7b2c840 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, 16:43 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/blenlib/intern/rand.c |
Revision 1e611c1 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, 15:11 (GMT) |
Remove Draw at Stroke Location This option at layer level was only for very limited situations and added complexity not needed. |
Revision 37ffbb2 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, 14:24 (GMT) |
Rename field gradient_boxsize to pattern_gridsize |
Revision bebc6bf 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:46 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/editors/datafiles/CMakeLists.txt source/blender/makesdna/DNA_material_types.h |
Revision 795a266 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) |
Added missing "Custom Properties" panel for GP Objects |
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 |
|