Blender Git Loki

Git Commits -> Revision ca3cd8f

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.

Commit Details:

Full Hash: ca3cd8f91612f014328df811fa96e4f650e4d34d
Parent Commit: efc08aa
Lines Changed: +4535, -16

28 Added Paths:

/release/scripts/startup/bl_ui/properties_data_shaderfx.py (+134, -0) (View)
/source/blender/blenkernel/BKE_shader_fx.h (+180, -0) (View)
/source/blender/blenkernel/intern/shader_fx.c (+245, -0) (View)
/source/blender/draw/engines/gpencil/gpencil_shader_fx.c (+822, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl (+44, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl (+86, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_flip_frag.glsl (+37, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_light_frag.glsl (+70, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_pixel_frag.glsl (+50, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_prepare_frag.glsl (+56, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl (+101, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl (+70, -0) (View)
/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl (+40, -0) (View)
/source/blender/editors/object/object_shader_fx.c (+467, -0) (View)
/source/blender/makesdna/DNA_shader_fx_types.h (+196, -0) (View)
/source/blender/makesrna/intern/rna_shader_fx.c (+538, -0) (View)
/source/blender/shader_fx/CMakeLists.txt (+64, -0) (View)
/source/blender/shader_fx/FX_shader_types.h (+47, -0) (View)
/source/blender/shader_fx/intern/FX_shader_blur.c (+66, -0) (View)
/source/blender/shader_fx/intern/FX_shader_colorize.c (+69, -0) (View)
/source/blender/shader_fx/intern/FX_shader_flip.c (+69, -0) (View)
/source/blender/shader_fx/intern/FX_shader_light.c (+104, -0) (View)
/source/blender/shader_fx/intern/FX_shader_pixel.c (+66, -0) (View)
/source/blender/shader_fx/intern/FX_shader_rim.c (+70, -0) (View)
/source/blender/shader_fx/intern/FX_shader_swirl.c (+103, -0) (View)
/source/blender/shader_fx/intern/FX_shader_util.c (+56, -0) (View)
/source/blender/shader_fx/intern/FX_shader_util.h (+36, -0) (View)
/source/blender/shader_fx/intern/FX_shader_wave.c (+71, -0) (View)

36 Modified Paths:

/build_files/cmake/macros.cmake (+1, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_object.h (+4, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+3, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+64, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+42, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+21, -0) (Diff)
/source/blender/CMakeLists.txt (+2, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+7, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+25, -0) (Diff)
/source/blender/draw/CMakeLists.txt (+12, -0) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.c (+57, -10) (Diff)
/source/blender/draw/engines/gpencil/gpencil_engine.h (+49, -3) (Diff)
/source/blender/draw/engines/gpencil/gpencil_render.c (+4, -0) (Diff)
/source/blender/editors/include/ED_object.h (+15, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+121, -0) (Diff)
/source/blender/editors/object/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/object/object_add.c (+4, -0) (Diff)
/source/blender/editors/object/object_intern.h (+6, -0) (Diff)
/source/blender/editors/object/object_ops.c (+6, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+17, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+3, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -0) (Diff)
/source/blender/makesdna/intern/makesdna.c (+2, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+77, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+8, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+9, -0) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+1, -0) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021