Revision 47402dd 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 6, 2018, 11:37 (GMT) |
Color PIcker use list of materials not object materials Now, the list shows all grease pencil materials and not only the materials of the active object. If the material selected is not in the active object material slots, the material is added automatically when draw. |
Revision d10688d 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 6, 2018, 10:02 (GMT) |
Cleanup: Rename function |
Revision a1b159d 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 6, 2018, 10:00 (GMT) |
Cleanup: Remove unused parameter |
Revision 8411afa 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 6, 2018, 09:27 (GMT) |
Cleanup: Remove unused variable |
Revision 2eb8779 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 6, 2018, 09:25 (GMT) |
Use Brush material for Fill brush Now the color used is the assigned to the brush and not the active color in material slots. |
Revision 31a371f 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 6, 2018, 08:51 (GMT) |
Fix compiler errors after merge |
Revision 9b4931f 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 6, 2018, 08:35 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/makesdna/DNA_scene_types.h |
Revision c061daa 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 5, 2018, 15:17 (GMT) |
Use as Brush Material default slot 1 Use always the first material as default if the brush hasn't assigned a material. Before, the current slot was used as default, but this could create a misunderstanding and make the artist believe he could select the color in properties. |
Revision e4c6dee 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 5, 2018, 10:06 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 8c6a4a6 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 4, 2018, 16:53 (GMT) |
Cleanup: Remove redundant function (and cleanup compiler warnings in the process) BKE_gpencil_frame_color_duplicate() is no longer needed to perform Grease Pencil's in-house "COW" operations. It was previously used to create a copy of the palette datablock being used, and to then reassign all the color pointers. Now that that's no longer needed, we can just use the standard one. Note: BKE_gpencil_stroke_duplicate() has now been modified to NOT clear the triangles array anymore. Instead, since most places that use this will clear/reallocate it themselves, it's easier to just keep it there, making the COW stuff easier. |
Revision 7726e46 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 4, 2018, 16:43 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/depsgraph/intern/builder/deg_builder_relations.cc |
Revision e455c54 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 4, 2018, 15:34 (GMT) |
Cleanup: Fix code format broken by previous commit |
Revision ba770b0 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 4, 2018, 15:19 (GMT) |
Make color picker panel set Brush Material When select a color in the panel, the color is assigned to the current Brush as its default material. |
Revision 9dab545 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 4, 2018, 14:53 (GMT) |
Use Brush material for drawing instead of Active slot Instead to use the active material in the list of materials, now always use the material assigned to Brush. If the brush hasn't a material assigned, then the current slot is assigned as the brush material and it will be used in the next drawings of this brush. |
Revision 6075b7d 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 4, 2018, 14:27 (GMT) |
Fix: Only show GP add shapes panel when GP object is active |
Revision 3a605ed 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 4, 2018, 14:13 (GMT) |
Fix print about removed properties * show_only_render has been removed. Instead, this is now handled through the overlays popovers. Therefore, we no longer need (or should have) a dedicated button for this. * Removed also the lock camera button. This shouldn't be here in the first place, as it was a dedicated workflow-specific hack added for the Hero production workflow only. |
Revision 8d3684c 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 4, 2018, 14:03 (GMT) |
Cleanup: Remove the now unnecessary modifier_index parameter from Modifier->generateStrokes() |
Revision 38718a6 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 4, 2018, 13:48 (GMT) |
Merge branch 'blender2.8' into greasepencil-object |
Revision 0a28eb6 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 4, 2018, 13:48 (GMT) |
Fix compiler warnings after merge * Adapted various DRW_* identifiers that got cleaned up in 2.8 * BKE_gpencil_frame_color_duplicate() - should be removed * File versioning code for GP annotation datablocks - knock this out for now (since it's causing compiling problems due to the view layer stuff being deprecated). We need to review whether we do this type of patching automatically, since we don't really want GP annotations to show up on Cycles renders for example. |
Revision 68b8ea0 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 4, 2018, 10:41 (GMT) |
Fix GP modifiers after merge (formatting/extra fields added to modifiers) |
|