Blender Git Loki
Git Commits -> Revision 7a9ad02
Revision 7a9ad02 by Campbell Barton (master) May 24, 2017, 13:38 (GMT) |
Remove TexFace, per-face images TexFace complicates the now more popular shading pipeline by having per-face images, see: T51382 for details. To keep the ability to select a per-material edit-image (used with UV-mapping workflow), the material now stores an image which will be set when changing images in edit-mode. This is used as a bake-target when not using Cycles too. |
Commit Details:
Full Hash: 7a9ad029dd1d1afe42d54c9c181de887636db7c0
Parent Commit: 707340e
Lines Changed: +278, -1219
47 Modified Paths:
/release/scripts/startup/bl_ui/properties_data_modifier.py (+0, -1) (Diff)
/release/scripts/startup/bl_ui/properties_material.py (+3, -5) (Diff)
/source/blender/blenkernel/BKE_material.h (+4, -3) (Diff)
/source/blender/blenkernel/intern/customdata.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/library_query.c (+1, -25) (Diff)
/source/blender/blenkernel/intern/material.c (+19, -489) (Diff)
/source/blender/blenloader/intern/readfile.c (+5, -117) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+0, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.h (+0, -1) (Diff)
/source/blender/bmesh/operators/bmo_similar.c (+1, -16) (Diff)
/source/blender/collada/collada.cpp (+0, -2) (Diff)
/source/blender/collada/collada.h (+0, -1) (Diff)
/source/blender/collada/EffectExporter.cpp (+0, -65) (Diff)
/source/blender/collada/ExportSettings.h (+0, -1) (Diff)
/source/blender/collada/ImageExporter.cpp (+0, -56) (Diff)
/source/blender/collada/ImageExporter.h (+0, -1) (Diff)
/source/blender/collada/MeshImporter.cpp (+8, -27) (Diff)
/source/blender/collada/MeshImporter.h (+5, -5) (Diff)
/source/blender/editors/include/ED_uvedit.h (+1, -1) (Diff)
/source/blender/editors/io/io_collada.c (+0, -9) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+0, -1) (Diff)
/source/blender/editors/object/object_bake.c (+42, -16) (Diff)
/source/blender/editors/space_image/space_image.c (+12, -7) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -3) (Diff)
/source/blender/editors/uvedit/uvedit_buttons.c (+2, -8) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+23, -9) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+44, -135) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+12, -2) (Diff)
/source/blender/makesdna/DNA_material_types.h (+6, -2) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+0, -3) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_material.c (+6, -12) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+0, -50) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_scene_api.c (+0, -5) (Diff)
/source/blender/modifiers/intern/MOD_uvproject.c (+12, -7) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.c (+5, -35) (Diff)
/source/blender/render/extern/include/RE_multires_bake.h (+6, -0) (Diff)
/source/blender/render/intern/source/bake.c (+4, -3) (Diff)
/source/blender/render/intern/source/multires_bake.c (+29, -20) (Diff)
/source/blender/render/intern/source/shadeinput.c (+4, -41) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+3, -14) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+12, -8) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+3, -1) (Diff)
/release/scripts/startup/bl_ui/properties_material.py (+3, -5) (Diff)
/source/blender/blenkernel/BKE_material.h (+4, -3) (Diff)
/source/blender/blenkernel/intern/customdata.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/library_query.c (+1, -25) (Diff)
/source/blender/blenkernel/intern/material.c (+19, -489) (Diff)
/source/blender/blenloader/intern/readfile.c (+5, -117) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+0, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.h (+0, -1) (Diff)
/source/blender/bmesh/operators/bmo_similar.c (+1, -16) (Diff)
/source/blender/collada/collada.cpp (+0, -2) (Diff)
/source/blender/collada/collada.h (+0, -1) (Diff)
/source/blender/collada/EffectExporter.cpp (+0, -65) (Diff)
/source/blender/collada/ExportSettings.h (+0, -1) (Diff)
/source/blender/collada/ImageExporter.cpp (+0, -56) (Diff)
/source/blender/collada/ImageExporter.h (+0, -1) (Diff)
/source/blender/collada/MeshImporter.cpp (+8, -27) (Diff)
/source/blender/collada/MeshImporter.h (+5, -5) (Diff)
/source/blender/editors/include/ED_uvedit.h (+1, -1) (Diff)
/source/blender/editors/io/io_collada.c (+0, -9) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+0, -1) (Diff)
/source/blender/editors/object/object_bake.c (+42, -16) (Diff)
/source/blender/editors/space_image/space_image.c (+12, -7) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -3) (Diff)
/source/blender/editors/uvedit/uvedit_buttons.c (+2, -8) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+23, -9) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+44, -135) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+12, -2) (Diff)
/source/blender/makesdna/DNA_material_types.h (+6, -2) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+0, -3) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_material.c (+6, -12) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+0, -50) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_scene_api.c (+0, -5) (Diff)
/source/blender/modifiers/intern/MOD_uvproject.c (+12, -7) (Diff)
/source/blender/python/bmesh/bmesh_py_types_meshdata.c (+5, -35) (Diff)
/source/blender/render/extern/include/RE_multires_bake.h (+6, -0) (Diff)
/source/blender/render/intern/source/bake.c (+4, -3) (Diff)
/source/blender/render/intern/source/multires_bake.c (+29, -20) (Diff)
/source/blender/render/intern/source/shadeinput.c (+4, -41) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+3, -14) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+12, -8) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+3, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021