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) |
Revision d6a3880 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:21 (GMT) |
Merge branch 'blender2.8' into greasepencil-object # Todo's / Need Further Review: # - material.c - "man->gpcolor = NULL" (commented out for now) # - rna_material.c - "rna_Material_update()" - Should GP material settings use their own update? # - GP Modifiers typedefines need updating for the new struct layout # - Merge conflicts in properties_gp_common.py - Mostly due to panels being removed in GP branch # - GP Panels in 3D View (toolbar/topbar fixes postponed till after branch merge) # - GP "Paper" Option/Settings (should become overlay? Design work needed) # Conflicts: # release/scripts/addons # release/scripts/addons_contrib # release/scripts/startup/bl_ui/properties_grease_pencil_common.py # release/scripts/startup/bl_ui/space_view3d.py # release/scripts/startup/bl_ui/space_view3d_toolbar.py # source/blender/blenkernel/BKE_modifier.h # source/blender/blenkernel/intern/material.c # source/blender/editors/object/object_transform.c # source/blender/editors/space_outliner/outliner_select.c # source/blender/gpu/intern/gpu_shader.c # source/blender/makesrna/intern/rna_material.c # source/blender/modifiers/intern/MOD_armature.c # source/blender/modifiers/intern/MOD_array.c # source/blender/modifiers/intern/MOD_bevel.c # source/blender/modifiers/intern/MOD_boolean.c # source/blender/modifiers/intern/MOD_build.c # source/blender/modifiers/intern/MOD_cast.c # source/blender/modifiers/intern/MOD_cloth.c # source/blender/modifiers/intern/MOD_collision.c # source/blender/modifiers/intern/MOD_correctivesmooth.c # source/blender/modifiers/intern/MOD_curve.c # source/blender/modifiers/intern/MOD_datatransfer.c # source/blender/modifiers/intern/MOD_decimate.c # source/blender/modifiers/intern/MOD_displace.c # source/blender/modifiers/intern/MOD_dynamicpaint.c # source/blender/modifiers/intern/MOD_edgesplit.c # source/blender/modifiers/intern/MOD_explode.c # source/blender/modifiers/intern/MOD_fluidsim.c # source/blender/modifiers/intern/MOD_hook.c # source/blender/modifiers/intern/MOD_laplaciandeform.c # source/blender/modifiers/intern/MOD_laplaciansmooth.c # source/blender/modifiers/intern/MOD_lattice.c # source/blender/modifiers/intern/MOD_mask.c # source/blender/modifiers/intern/MOD_meshcache.c # source/blender/modifiers/intern/MOD_meshdeform.c # source/blender/modifiers/intern/MOD_meshsequencecache.c # source/blender/modifiers/intern/MOD_mirror.c # source/blender/modifiers/intern/MOD_multires.c # source/blender/modifiers/intern/MOD_none.c # source/blender/modifiers/intern/MOD_normal_edit.c # source/blender/modifiers/intern/MOD_ocean.c # source/blender/modifiers/intern/MOD_particleinstance.c # source/blender/modifiers/intern/MOD_particlesystem.c # source/blender/modifiers/intern/MOD_remesh.c # source/blender/modifiers/intern/MOD_screw.c # source/blender/modifiers/intern/MOD_shapekey.c # source/blender/modifiers/intern/MOD_shrinkwrap.c # source/blender/modifiers/intern/MOD_simpledeform.c # source/blender/modifiers/intern/MOD_skin.c # source/blender/modifiers/intern/MOD_smoke.c # source/blender/modifiers/intern/MOD_smooth.c # source/blender/modifiers/intern/MOD_softbody.c # source/blender/modifiers/intern/MOD_solidify.c # source/blender/modifiers/intern/MOD_subsurf.c # source/blender/modifiers/intern/MOD_surface.c # source/blender/modifiers/intern/MOD_surfacedeform.c # source/blender/modifiers/intern/MOD_triangulate.c # source/blender/modifiers/intern/MOD_uvproject.c # source/blender/modifiers/intern/MOD_uvwarp.c # source/blender/modifiers/intern/MOD_warp.c # source/blender/modifiers/intern/MOD_wave.c # source/blender/modifiers/intern/MOD_weightvgedit.c # source/blender/modifiers/intern/MOD_weightvgmix.c # source/blender/modifiers/intern/MOD_weightvgproximity.c # source/blender/modifiers/intern/MOD_wireframe.c |
Revision 00c54fb 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 1, 2018, 17:12 (GMT) |
Cleanup: Material Buttons for GP * Don't collapse panels by default * Cleanup old code/names/etc. |
Revision c52f6b1 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 1, 2018, 17:12 (GMT) |
GP Properties: Separate onion skinning for datablock + per-layer override into separate panels The panel layouts are still a mess, but at least there's less code duplication and weirdness now, with everything taking advantage of more conventions here. |
Revision 60549a6 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 1, 2018, 15:36 (GMT) |
Remove dirty cache calls from kernel The function BKE_gpencil_batch_cache_dirty() must be called only from operators or RNA. Besides, the calls removed were redundant. |
Revision 356ce71 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 1, 2018, 14:27 (GMT) |
GPencil Editors API: Added utility function to be called to get Copy-on-Write evaluated copies of data * Use ED_gpencil_get_active() for writing settings back to the original datablock (existing callback used in most operators now) * Use ED_gpencil_get_active_evaluated() for getting the COW-evaluated geometry (i.e. with modifiers, etc.) applied. i.e., ``` const bGPdata *gpd_eval = ED_gpencil_get_active_evaluated(C); ``` |
Revision 69c042b 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 1, 2018, 14:27 (GMT) |
Code Cleanup: Clearly label which parameters are used for input/output |
Revision c70de3a 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 1, 2018, 14:27 (GMT) |
Cleanup: Fix indentation |
Revision dca23cc 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 1, 2018, 14:27 (GMT) |
Cleanup: Fix some more warnings NOTE: For rna_GPencil_stroke_new(), the problems aren't entirely eliminated yet. Specifically, the colorname arg is now unused - it was used in the past to specify what color the new strokes should have. |
Revision ed29a6f 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 1, 2018, 14:27 (GMT) |
Cleanup: Remove unused var |
|
|
|


Master Commits
MiikaHweb | 2003-2021