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 |
Revision 4cb2d6d 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, 13:59 (GMT) |
Revert to use again BKE_gpencil_batch_cache_dirty() These functions were changed by error when replace dirty management by depsgraph. The depsgraph is only valid for operators and the files included in this commit must call the function directly and don't use depsgraph tag. |
Revision 7c5a146 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, 13:50 (GMT) |
Back BKE_gpencil_batch_cache_dirty function This function was removed by error in previous commit. |
Revision 82150ed 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, 11:51 (GMT) |
Cleanup: Add new line at EOF |
Revision 63c91f2 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, 11:48 (GMT) |
Remove BKE_gpencil_batch_cache_dirty() This remove the function because is not used. |
Revision 8098dc3 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, 11:44 (GMT) |
Replace DRW_gpencil_batch_cache_dirty() with DEG_id_tag_update |
Revision a597e21 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) April 30, 2018, 17:41 (GMT) |
Cleanup. Rename material variable to "ma" The old name "mat" could be confused with matrix. |
Revision 50e91b6 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) April 30, 2018, 15:41 (GMT) |
WIP depsgraph fixes for GP and depsgraph Still not working yet - somehow the updates aren't getting flushed yet (perhaps COW related) |
Revision d45f1e9 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) April 30, 2018, 15:41 (GMT) |
Cleanup: Indentation |
Revision e6d4465 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) April 30, 2018, 15:22 (GMT) |
Add default brush material to object materials When draw using a brush that uses a default material, the material must be added to the object material slots if this material was not before. |
Revision 7a5747d 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) April 30, 2018, 15:09 (GMT) |
Rename Grease Pencil Array Modifier to Instance Modifier The new name is more clear and does not create confusion with 3D objects array modifier. |
Revision 09c900b 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) April 30, 2018, 14:18 (GMT) |
Fix error drawing with no object active |
|