diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-11 08:14:28 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-11 08:14:28 +0300 |
| commit | f06d361da1249c93568153bae88bcdf43b4774a1 (patch) | |
| tree | 5acd7443d2c13d3f89b40e81f7d93df5e2a56008 /source/blender/gpu/shaders/material/gpu_shader_material_texture_coordinates.glsl | |
| parent | ab6939ff78f131e5270e17b9ee73075b512a1a3f (diff) | |
| parent | 5e47056e8d97e414c9dabacea71fac2bdc7d2818 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel
# Conflicts:
# intern/cycles/app/opengl/display_driver.cpp
# intern/cycles/app/opengl/display_driver.h
# intern/cycles/app/opengl/shader.cpp
# intern/cycles/app/opengl/shader.h
# intern/cycles/app/opengl/window.cpp
# intern/cycles/app/opengl/window.h
# intern/cycles/blender/addon/ui.py
# intern/cycles/util/view.cpp
# intern/cycles/util/view.h
# release/scripts/startup/bl_ui/properties_data_armature.py
# release/scripts/startup/bl_ui/properties_view_layer.py
# source/blender/blenkernel/BKE_armature.h
# source/blender/blenkernel/BKE_blender_version.h
# source/blender/blenkernel/BKE_curves.hh
# source/blender/blenkernel/BKE_gpencil_update_cache.h
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/CMakeLists.txt
# source/blender/blenkernel/intern/curve_eval.cc
# source/blender/blenkernel/intern/curves_geometry.cc
# source/blender/blenkernel/intern/geometry_component_curves.cc
# source/blender/blenkernel/intern/lib_override.c
# source/blender/blenkernel/intern/lib_override_proxy_conversion.c
# source/blender/blenkernel/intern/scene.cc
# source/blender/blenkernel/intern/type_conversions.cc
# source/blender/blenloader/intern/versioning_300.c
# source/blender/draw/engines/eevee/eevee_data.c
# source/blender/draw/engines/image/image_drawing_mode.hh
# source/blender/draw/engines/image/image_space.hh
# source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh
# source/blender/draw/intern/draw_cache_impl_subdivision.cc
# source/blender/editors/gpencil/gpencil_fill.c
# source/blender/editors/include/ED_paint.h
# source/blender/editors/object/object_bake.c
# source/blender/editors/render/render_intern.hh
# source/blender/editors/render/render_ops.cc
# source/blender/editors/render/render_shading.cc
# source/blender/editors/screen/area.c
# source/blender/editors/sculpt_paint/paint_canvas.cc
# source/blender/editors/sculpt_paint/sculpt_intern.h
# source/blender/editors/sculpt_paint/sculpt_paint_color.c
# source/blender/editors/space_node/node_intern.hh
# source/blender/editors/space_outliner/outliner_tools.cc
# source/blender/editors/transform/transform_convert_sequencer.c
# source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c
# source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
# source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
# source/blender/makesdna/DNA_ID.h
# source/blender/makesdna/DNA_curves_types.h
# source/blender/makesrna/intern/rna_internal.h
# source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
# source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc
Diffstat (limited to 'source/blender/gpu/shaders/material/gpu_shader_material_texture_coordinates.glsl')
0 files changed, 0 insertions, 0 deletions