[Bf-blender-cvs] [0f8a0647d71] new-object-types: Objects: add initial structures for hair, point cloud and volume datablocks

Brecht Van Lommel noreply at git.blender.org
Thu Jan 23 19:05:02 CET 2020


Commit: 0f8a0647d71cc14ca684eeda494aba7c67faf70f
Author: Brecht Van Lommel
Date:   Wed Mar 27 01:39:11 2019 +0100
Branches: new-object-types
https://developer.blender.org/rB0f8a0647d71cc14ca684eeda494aba7c67faf70f

Objects: add initial structures for hair, point cloud and volume datablocks

This is a starting point for developers, these don't do anything useful
yet and have no drawing or rendering code.

Ref T68981, T73201.

===================================================================

M	release/datafiles/blender_icons.svg
A	release/datafiles/blender_icons16/icon16_hair_data.dat
A	release/datafiles/blender_icons16/icon16_outliner_data_hair.dat
A	release/datafiles/blender_icons16/icon16_outliner_data_pointcloud.dat
A	release/datafiles/blender_icons16/icon16_outliner_data_volume.dat
A	release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat
A	release/datafiles/blender_icons16/icon16_outliner_ob_pointcloud.dat
A	release/datafiles/blender_icons16/icon16_outliner_ob_volume.dat
A	release/datafiles/blender_icons16/icon16_pointcloud_data.dat
A	release/datafiles/blender_icons16/icon16_volume_data.dat
A	release/datafiles/blender_icons32/icon32_hair_data.dat
A	release/datafiles/blender_icons32/icon32_outliner_data_hair.dat
A	release/datafiles/blender_icons32/icon32_outliner_data_pointcloud.dat
A	release/datafiles/blender_icons32/icon32_outliner_data_volume.dat
A	release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat
A	release/datafiles/blender_icons32/icon32_outliner_ob_pointcloud.dat
A	release/datafiles/blender_icons32/icon32_outliner_ob_volume.dat
A	release/datafiles/blender_icons32/icon32_pointcloud_data.dat
A	release/datafiles/blender_icons32/icon32_volume_data.dat
M	release/scripts/startup/bl_ui/__init__.py
A	release/scripts/startup/bl_ui/properties_data_hair.py
A	release/scripts/startup/bl_ui/properties_data_pointcloud.py
A	release/scripts/startup/bl_ui/properties_data_volume.py
M	release/scripts/startup/bl_ui/space_dopesheet.py
M	release/scripts/startup/bl_ui/space_outliner.py
M	release/scripts/startup/bl_ui/space_userpref.py
M	release/scripts/startup/bl_ui/space_view3d.py
A	source/blender/blenkernel/BKE_hair.h
M	source/blender/blenkernel/BKE_main.h
M	source/blender/blenkernel/BKE_packedFile.h
A	source/blender/blenkernel/BKE_pointcloud.h
A	source/blender/blenkernel/BKE_volume.h
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/intern/bpath.c
M	source/blender/blenkernel/intern/customdata.c
A	source/blender/blenkernel/intern/hair.c
M	source/blender/blenkernel/intern/idcode.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/library_query.c
M	source/blender/blenkernel/intern/library_remap.c
M	source/blender/blenkernel/intern/main.c
M	source/blender/blenkernel/intern/material.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/object_update.c
M	source/blender/blenkernel/intern/packedFile.c
A	source/blender/blenkernel/intern/pointcloud.c
A	source/blender/blenkernel/intern/volume.cc
M	source/blender/blenloader/intern/readblenentry.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/readfile.h
M	source/blender/blenloader/intern/writefile.c
M	source/blender/blentranslation/BLT_translation.h
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc
M	source/blender/draw/engines/eevee/eevee_engine.c
M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/engines/eevee/eevee_render.c
M	source/blender/draw/engines/workbench/workbench_deferred.c
M	source/blender/draw/engines/workbench/workbench_forward.c
M	source/blender/draw/intern/draw_common.c
M	source/blender/editors/animation/anim_channels_defines.c
M	source/blender/editors/animation/anim_channels_edit.c
M	source/blender/editors/animation/anim_filter.c
M	source/blender/editors/include/ED_anim_api.h
M	source/blender/editors/include/UI_icons.h
M	source/blender/editors/interface/interface_icons.c
M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/object/object_add.c
M	source/blender/editors/object/object_intern.h
M	source/blender/editors/object/object_modifier.c
M	source/blender/editors/object/object_ops.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/render/render_opengl.c
M	source/blender/editors/screen/area.c
M	source/blender/editors/space_buttons/buttons_context.c
M	source/blender/editors/space_file/filelist.c
M	source/blender/editors/space_info/info_stats.c
M	source/blender/editors/space_nla/nla_buttons.c
M	source/blender/editors/space_nla/nla_channels.c
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_tools.c
M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/makesdna/DNA_ID.h
M	source/blender/makesdna/DNA_action_types.h
M	source/blender/makesdna/DNA_customdata_types.h
A	source/blender/makesdna/DNA_hair_types.h
M	source/blender/makesdna/DNA_object_types.h
A	source/blender/makesdna/DNA_pointcloud_types.h
M	source/blender/makesdna/DNA_userdef_types.h
A	source/blender/makesdna/DNA_volume_types.h
M	source/blender/makesdna/intern/makesdna.c
M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/RNA_types.h
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/makesrna.c
M	source/blender/makesrna/intern/rna_ID.c
M	source/blender/makesrna/intern/rna_action.c
A	source/blender/makesrna/intern/rna_hair.c
M	source/blender/makesrna/intern/rna_internal.h
M	source/blender/makesrna/intern/rna_main.c
M	source/blender/makesrna/intern/rna_main_api.c
M	source/blender/makesrna/intern/rna_object.c
A	source/blender/makesrna/intern/rna_pointcloud.c
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_userdef.c
A	source/blender/makesrna/intern/rna_volume.c

===================================================================

diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 6a87ac0adaa..01183fb3091 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -5348,6 +5348,117 @@
       <path sodipodi:nodetypes="csssscccccc" inkscape:connector-curvature="0" id="path28911-6" transform="translate(540,1)" d="m 7,654 v 8 c 0,0.54532 0.45468,1 1,1 h 12 c 0.54532,0 1,-0.45468 1,-1 v -8 h -1 v 8 H 8 v -8 z" style="opacity:0.6;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke"/>
       <path sodipodi:nodetypes="ssccccsssccccc" inkscape:connector-curvature="0" style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke" d="m 8,670 c -0.54532,0 -1,0.45468 -1,1 v 3 h 1 12 1 v -3 c 0,-0.54532 -0.45468,-1 -1,-1 z m 0,1 h 2 v 2 H 8 Z" transform="translate(540,-20)" id="path28 [...]
     </g>
+    <g
+       style="display:inline;opacity:1;fill:#ffffff;enable-background:new"
+       id="g7388-6-3"
+       transform="translate(457.49535,-616.1486)"
+       inkscape:export-filename="C:\Users\Andrzej Ambroż\Desktop\mtrx.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <rect
+         transform="scale(-1,1)"
+         style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79999995;marker:none;enable-background:accumulate"
+         id="rect7384-9-6"
+         width="16"
+         height="16"
+         x="437"
+         y="710" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:nor [...]
+         d="m -447.96289,710.98828 a 1.0001,1.0001 0 0 0 -0.83789,0.41211 c -3.30626,4.40835 -3.18183,10.96743 -3.18555,12.58399 a 1.0001,1.0001 0 1 0 2,0.006 c 0.004,-1.64212 0.0934,-7.79897 2.78711,-11.39062 a 1.0001,1.0001 0 0 0 -0.76367,-1.61133 z m 4.97461,3.00195 a 1.0001,1.0001 0 0 0 -0.69727,0.28125 c -2.25424,2.12239 -3.3739,3.98924 -3.89062,5.64258 C -448.0929,721.56741 -448,722.96385 -448,724 a 1.0001,1.0001 0 1 0 2,0 c 0,-1.13631 -0.0696,-2.20308 0.33203,-3.48828 0.40167,-1.2 [...]
+         id="path7133-7-7"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:norma [...]
+       d="m 30.560537,94.85135 a 0.50005,0.50005 0 0 0 -0.41797,0.20312 c -2.41605,3.180716 -3.44475,6.00321 -3.85742,8.28711 -0.41267,2.2839 -0.21655,4.04989 -0.21875,5.00586 a 0.50005,0.50005 0 1 0 1,0.004 c 0.002,-1.08433 -0.18375,-2.69094 0.20312,-4.83203 0.38687,-2.1411 1.34101,-4.795944 3.66797,-7.85938 a 0.50005,0.50005 0 0 0 -0.37695,-0.80858 z m 4.95508,3.001946 a 0.50005,0.50005 0 0 0 -0.30469,0.12695 c -4.12358,3.585044 -5.17188,7.536354 -5.17188,10.376954 a 0.50005,0.50005 0  [...]
+       id="path18476-0-2-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:norma [...]
+       d="m 52.942267,94.61165 a 0.50005,0.50005 0 0 0 -0.41797,0.20312 c -2.41605,3.180716 -3.44475,6.00321 -3.85743,8.28711 -0.41267,2.2839 -0.21654,4.04989 -0.21875,5.00586 a 0.50005,0.50005 0 1 0 1,0.004 c 0.002,-1.08433 -0.18374,-2.69094 0.20313,-4.83203 0.38687,-2.1411 1.341,-4.795944 3.66797,-7.85938 a 0.50005,0.50005 0 0 0 -0.37695,-0.80858 z m 4.95507,3.00195 a 0.50005,0.50005 0 0 0 -0.30468,0.12695 c -4.12359,3.58504 -5.17188,7.53635 -5.17188,10.37695 a 0.50005,0.50005 0 1 0 1, [...]
+       id="path18476-0-2-5-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:norma [...]
+       d="m 139.512,94.8218 c -0.39468,0.0302 -0.78775,0.12022 -1.16797,0.27148 -1.52086,0.60507 -2.52148,2.07999 -2.52148,3.716796 -7.6e-4,0.0448 0.004,0.0894 0.0156,0.13281 -0.36519,0.0927 -0.72282,0.22834 -1.0586,0.42774 -1.44139,0.855954 -2.17088,2.516884 -1.8789,4.144534 -0.68715,0.57705 -1.10816,1.44799 -1.07617,2.39648 0.0502,1.48769 1.19214,2.71921 2.67187,2.88086 1.39818,0.15274 2.69975,-0.69789 3.15234,-2.00781 0.89605,0.0388 1.7697,-0.22225 2.49805,-0.74609 1.07373,0.85551 2.5 [...]

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list