Blender Git Loki
Git Commits -> Revision b0a1cf2
Revision b0a1cf2 by Brecht Van Lommel (master) March 18, 2020, 10:23 (GMT) |
Objects: add Volume object type, and prototypes for Hair and PointCloud Only the volume object is exposed in the user interface. It is based on OpenVDB internally. Drawing and rendering code will follow in another commit. https://wiki.blender.org/wiki/Source/Objects/Volume https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Volumes Hair and PointCloud object types are hidden behind a WITH_NEW_OBJECT_TYPES build option. These are unfinished, and included only to make it easier to cooperate on development in the future and avoid tricky merges. https://wiki.blender.org/wiki/Source/Objects/New_Object_Types Ref T73201, T68981 Differential Revision: https://developer.blender.org/D6945 |
Commit Details:
Full Hash: b0a1cf2c9ae696b07f7a236bc855a5ab4a493dcb
Parent Commit: 8dcfd39
Lines Changed: +7092, -155
27 Added Paths:
/release/scripts/startup/bl_ui/properties_data_hair.py (+78, -0) (View)
/release/scripts/startup/bl_ui/properties_data_pointcloud.py (+78, -0) (View)
/release/scripts/startup/bl_ui/properties_data_volume.py (+173, -0) (View)
/source/blender/blenkernel/BKE_hair.h (+71, -0) (View)
/source/blender/blenkernel/BKE_pointcloud.h (+74, -0) (View)
/source/blender/blenkernel/BKE_volume.h (+168, -0) (View)
/source/blender/blenkernel/intern/hair.c (+292, -0) (View)
/source/blender/blenkernel/intern/pointcloud.c (+257, -0) (View)
/source/blender/blenkernel/intern/volume.cc (+1242, -0) (View)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc (+60, -0) (View)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h (+45, -0) (View)
/source/blender/draw/engines/overlay/overlay_pointcloud.c (+72, -0) (View)
/source/blender/draw/engines/overlay/shaders/pointcloud_frag.glsl (+16, -0) (View)
/source/blender/draw/engines/overlay/shaders/pointcloud_vert.glsl (+27, -0) (View)
/source/blender/draw/intern/draw_cache_impl_hair.c (+349, -0) (View)
/source/blender/draw/intern/draw_cache_impl_pointcloud.c (+176, -0) (View)
/source/blender/draw/intern/draw_cache_impl_volume.c (+297, -0) (View)
/source/blender/editors/object/object_volume.c (+193, -0) (View)
/source/blender/makesdna/DNA_hair_defaults.h (+40, -0) (View)
/source/blender/makesdna/DNA_hair_types.h (+82, -0) (View)
/source/blender/makesdna/DNA_pointcloud_defaults.h (+40, -0) (View)
/source/blender/makesdna/DNA_pointcloud_types.h (+64, -0) (View)
/source/blender/makesdna/DNA_volume_defaults.h (+59, -0) (View)
/source/blender/makesdna/DNA_volume_types.h (+130, -0) (View)
/source/blender/makesrna/intern/rna_hair.c (+244, -0) (View)
/source/blender/makesrna/intern/rna_pointcloud.c (+175, -0) (View)
/source/blender/makesrna/intern/rna_volume.c (+557, -0) (View)
/release/scripts/startup/bl_ui/properties_data_pointcloud.py (+78, -0) (View)
/release/scripts/startup/bl_ui/properties_data_volume.py (+173, -0) (View)
/source/blender/blenkernel/BKE_hair.h (+71, -0) (View)
/source/blender/blenkernel/BKE_pointcloud.h (+74, -0) (View)
/source/blender/blenkernel/BKE_volume.h (+168, -0) (View)
/source/blender/blenkernel/intern/hair.c (+292, -0) (View)
/source/blender/blenkernel/intern/pointcloud.c (+257, -0) (View)
/source/blender/blenkernel/intern/volume.cc (+1242, -0) (View)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.cc (+60, -0) (View)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h (+45, -0) (View)
/source/blender/draw/engines/overlay/overlay_pointcloud.c (+72, -0) (View)
/source/blender/draw/engines/overlay/shaders/pointcloud_frag.glsl (+16, -0) (View)
/source/blender/draw/engines/overlay/shaders/pointcloud_vert.glsl (+27, -0) (View)
/source/blender/draw/intern/draw_cache_impl_hair.c (+349, -0) (View)
/source/blender/draw/intern/draw_cache_impl_pointcloud.c (+176, -0) (View)
/source/blender/draw/intern/draw_cache_impl_volume.c (+297, -0) (View)
/source/blender/editors/object/object_volume.c (+193, -0) (View)
/source/blender/makesdna/DNA_hair_defaults.h (+40, -0) (View)
/source/blender/makesdna/DNA_hair_types.h (+82, -0) (View)
/source/blender/makesdna/DNA_pointcloud_defaults.h (+40, -0) (View)
/source/blender/makesdna/DNA_pointcloud_types.h (+64, -0) (View)
/source/blender/makesdna/DNA_volume_defaults.h (+59, -0) (View)
/source/blender/makesdna/DNA_volume_types.h (+130, -0) (View)
/source/blender/makesrna/intern/rna_hair.c (+244, -0) (View)
/source/blender/makesrna/intern/rna_pointcloud.c (+175, -0) (View)
/source/blender/makesrna/intern/rna_volume.c (+557, -0) (View)
91 Modified Paths:
/CMakeLists.txt (+4, -0) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_dopesheet.py (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+3, -0) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_outliner.py (+3, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+7, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+24, -0) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+3, -0) (Diff)
/source/blender/blenkernel/BKE_idtype.h (+5, -0) (Diff)
/source/blender/blenkernel/BKE_main.h (+4, -1) (Diff)
/source/blender/blenkernel/BKE_packedFile.h (+5, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+12, -9) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+30, -0) (Diff)
/source/blender/blenkernel/intern/bpath.c (+8, -0) (Diff)
/source/blender/blenkernel/intern/customdata.c (+15, -1) (Diff)
/source/blender/blenkernel/intern/effect.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/idcode.c (+18, -4) (Diff)
/source/blender/blenkernel/intern/idtype.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/lib_id.c (+34, -20) (Diff)
/source/blender/blenkernel/intern/lib_query.c (+30, -0) (Diff)
/source/blender/blenkernel/intern/lib_remap.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/main.c (+9, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+55, -20) (Diff)
/source/blender/blenkernel/intern/object.c (+77, -0) (Diff)
/source/blender/blenkernel/intern/object_update.c (+21, -0) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+69, -0) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+210, -1) (Diff)
/source/blender/blenloader/intern/readfile.h (+3, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+104, -0) (Diff)
/source/blender/blentranslation/BLT_translation.h (+6, -0) (Diff)
/source/blender/depsgraph/CMakeLists.txt (+2, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+27, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+22, -2) (Diff)
/source/blender/depsgraph/intern/depsgraph_tag.cc (+7, -1) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc (+8, -1) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h (+2, -0) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc (+11, -0) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+268, -18) (Diff)
/source/blender/editors/animation/anim_channels_edit.c (+20, -5) (Diff)
/source/blender/editors/animation/anim_filter.c (+72, -0) (Diff)
/source/blender/editors/include/ED_anim_api.h (+6, -0) (Diff)
/source/blender/editors/include/UI_icons.h (+11, -10) (Diff)
/source/blender/editors/interface/interface_icons.c (+6, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+13, -1) (Diff)
/source/blender/editors/object/CMakeLists.txt (+5, -0) (Diff)
/source/blender/editors/object/object_add.c (+77, -1) (Diff)
/source/blender/editors/object/object_intern.h (+6, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+14, -0) (Diff)
/source/blender/editors/object/object_ops.c (+6, -0) (Diff)
/source/blender/editors/object/object_relations.c (+12, -0) (Diff)
/source/blender/editors/render/render_opengl.c (+3, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+40, -1) (Diff)
/source/blender/editors/space_buttons/CMakeLists.txt (+4, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+14, -3) (Diff)
/source/blender/editors/space_file/filesel.c (+3, -0) (Diff)
/source/blender/editors/space_info/info_stats.c (+5, -0) (Diff)
/source/blender/editors/space_nla/nla_buttons.c (+4, -1) (Diff)
/source/blender/editors/space_nla/nla_channels.c (+4, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+10, -1) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+18, -0) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+4, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+21, -0) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+22, -0) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+9, -0) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+2, -2) (Diff)
/source/blender/makesdna/DNA_action_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_customdata_types.h (+11, -2) (Diff)
/source/blender/makesdna/DNA_defaults.h (+8, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+41, -34) (Diff)
/source/blender/makesdna/DNA_object_types.h (+25, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+3, -0) (Diff)
/source/blender/makesdna/intern/CMakeLists.txt (+3, -0) (Diff)
/source/blender/makesdna/intern/dna_defaults.c (+24, -0) (Diff)
/source/blender/makesdna/intern/makesdna.c (+6, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+12, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_action.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+32, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_main.c (+22, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+187, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+13, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+32, -7) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+17, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+3, -0) (Diff)
/source/blender/makesrna/RNA_types.h (+6, -0) (Diff)
/source/blender/windowmanager/intern/wm_operator_props.c (+6, -0) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_dopesheet.py (+6, -0) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+3, -0) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_outliner.py (+3, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+7, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+24, -0) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+3, -0) (Diff)
/source/blender/blenkernel/BKE_idtype.h (+5, -0) (Diff)
/source/blender/blenkernel/BKE_main.h (+4, -1) (Diff)
/source/blender/blenkernel/BKE_packedFile.h (+5, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+12, -9) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+30, -0) (Diff)
/source/blender/blenkernel/intern/bpath.c (+8, -0) (Diff)
/source/blender/blenkernel/intern/customdata.c (+15, -1) (Diff)
/source/blender/blenkernel/intern/effect.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/idcode.c (+18, -4) (Diff)
/source/blender/blenkernel/intern/idtype.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/lib_id.c (+34, -20) (Diff)
/source/blender/blenkernel/intern/lib_query.c (+30, -0) (Diff)
/source/blender/blenkernel/intern/lib_remap.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/main.c (+9, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+55, -20) (Diff)
/source/blender/blenkernel/intern/object.c (+77, -0) (Diff)
/source/blender/blenkernel/intern/object_update.c (+21, -0) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+69, -0) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+210, -1) (Diff)
/source/blender/blenloader/intern/readfile.h (+3, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+104, -0) (Diff)
/source/blender/blentranslation/BLT_translation.h (+6, -0) (Diff)
/source/blender/depsgraph/CMakeLists.txt (+2, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+27, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+22, -2) (Diff)
/source/blender/depsgraph/intern/depsgraph_tag.cc (+7, -1) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.cc (+8, -1) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h (+2, -0) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc (+11, -0) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+268, -18) (Diff)
/source/blender/editors/animation/anim_channels_edit.c (+20, -5) (Diff)
/source/blender/editors/animation/anim_filter.c (+72, -0) (Diff)
/source/blender/editors/include/ED_anim_api.h (+6, -0) (Diff)
/source/blender/editors/include/UI_icons.h (+11, -10) (Diff)
/source/blender/editors/interface/interface_icons.c (+6, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+13, -1) (Diff)
/source/blender/editors/object/CMakeLists.txt (+5, -0) (Diff)
/source/blender/editors/object/object_add.c (+77, -1) (Diff)
/source/blender/editors/object/object_intern.h (+6, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+14, -0) (Diff)
/source/blender/editors/object/object_ops.c (+6, -0) (Diff)
/source/blender/editors/object/object_relations.c (+12, -0) (Diff)
/source/blender/editors/render/render_opengl.c (+3, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+40, -1) (Diff)
/source/blender/editors/space_buttons/CMakeLists.txt (+4, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+14, -3) (Diff)
/source/blender/editors/space_file/filesel.c (+3, -0) (Diff)
/source/blender/editors/space_info/info_stats.c (+5, -0) (Diff)
/source/blender/editors/space_nla/nla_buttons.c (+4, -1) (Diff)
/source/blender/editors/space_nla/nla_channels.c (+4, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+10, -1) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+18, -0) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+4, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tools.c (+21, -0) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+22, -0) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+9, -0) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+2, -2) (Diff)
/source/blender/makesdna/DNA_action_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_customdata_types.h (+11, -2) (Diff)
/source/blender/makesdna/DNA_defaults.h (+8, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+41, -34) (Diff)
/source/blender/makesdna/DNA_object_types.h (+25, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+3, -0) (Diff)
/source/blender/makesdna/intern/CMakeLists.txt (+3, -0) (Diff)
/source/blender/makesdna/intern/dna_defaults.c (+24, -0) (Diff)
/source/blender/makesdna/intern/makesdna.c (+6, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+12, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_action.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+32, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_main.c (+22, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+187, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+13, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+32, -7) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+17, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+3, -0) (Diff)
/source/blender/makesrna/RNA_types.h (+6, -0) (Diff)
/source/blender/windowmanager/intern/wm_operator_props.c (+6, -0) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021