[Bf-blender-cvs] [74f7cdcf6bb] temp-volume-object: Volume object datablock skeleton code.
Brecht Van Lommel
noreply at git.blender.org
Tue Jul 17 01:44:26 CEST 2018
Commit: 74f7cdcf6bb8032b6bf8881007e0344366849859
Author: Brecht Van Lommel
Date: Fri Feb 9 12:02:41 2018 +0100
Branches: temp-volume-object
https://developer.blender.org/rB74f7cdcf6bb8032b6bf8881007e0344366849859
Volume object datablock skeleton code.
This only adds Shift+A > Volume object and displays a list of grid names
in a specified VDB file. Branch pushed for reference if someone other than
me wants to pick up this project.
===================================================================
M intern/openvdb/intern/openvdb_reader.cc
M intern/openvdb/intern/openvdb_reader.h
M intern/openvdb/openvdb_capi.cc
M intern/openvdb/openvdb_capi.h
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_outliner_data_volume.dat
A release/datafiles/blender_icons16/icon16_outliner_ob_volume.dat
M release/datafiles/blender_icons16/icon16_snap_volume.dat
A release/datafiles/blender_icons16/icon16_volume.dat
A release/datafiles/blender_icons16/icon16_volume_data.dat
A release/datafiles/blender_icons32/icon32_outliner_data_volume.dat
A release/datafiles/blender_icons32/icon32_outliner_ob_volume.dat
M release/datafiles/blender_icons32/icon32_snap_volume.dat
A release/datafiles/blender_icons32/icon32_volume.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_volume.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/blenkernel/BKE_library.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_packedFile.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/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/object.c
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/scene.c
A source/blender/blenkernel/intern/volume.c
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/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_ops.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/filesel.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_tree.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_object_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/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
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
M source/blender/makesrna/intern/rna_space.c
A source/blender/makesrna/intern/rna_volume.c
===================================================================
diff --git a/intern/openvdb/intern/openvdb_reader.cc b/intern/openvdb/intern/openvdb_reader.cc
index 8b15b81710d..8d6d5570e5b 100644
--- a/intern/openvdb/intern/openvdb_reader.cc
+++ b/intern/openvdb/intern/openvdb_reader.cc
@@ -122,6 +122,11 @@ openvdb::GridBase::Ptr OpenVDBReader::getGrid(const openvdb::Name &name) const
return m_file->readGrid(name);
}
+openvdb::GridBase::Ptr OpenVDBReader::getGrid(size_t index) const
+{
+ return (*(m_file->getGrids()))[index];
+}
+
size_t OpenVDBReader::numGrids() const
{
return m_file->getGrids()->size();
diff --git a/intern/openvdb/intern/openvdb_reader.h b/intern/openvdb/intern/openvdb_reader.h
index 07f77130ff9..9454569ccd5 100644
--- a/intern/openvdb/intern/openvdb_reader.h
+++ b/intern/openvdb/intern/openvdb_reader.h
@@ -49,6 +49,7 @@ public:
bool hasGrid(const openvdb::Name &name) const;
openvdb::GridBase::Ptr getGrid(const openvdb::Name &name) const;
+ openvdb::GridBase::Ptr getGrid(size_t index) const;
size_t numGrids() const;
};
diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc
index 1c8b51a23c4..50f0806eacf 100644
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@ -240,3 +240,13 @@ void OpenVDBReader_get_meta_mat4(OpenVDBReader *reader, const char *name, float
{
reader->mat4sMeta(name, value);
}
+
+size_t OpenVDBReader_num_grids(struct OpenVDBReader *reader)
+{
+ return reader->numGrids();
+}
+
+const char *OpenVDBReader_grid_name(struct OpenVDBReader *reader, size_t index)
+{
+ return reader->getGrid(index)->getName().c_str();
+}
diff --git a/intern/openvdb/openvdb_capi.h b/intern/openvdb/openvdb_capi.h
index fe7af82769b..cd42c60ee3a 100644
--- a/intern/openvdb/openvdb_capi.h
+++ b/intern/openvdb/openvdb_capi.h
@@ -30,12 +30,19 @@
extern "C" {
#endif
-struct OpenVDBReader;
+#include <stdlib.h>
+
struct OpenVDBWriter;
struct OpenVDBFloatGrid;
struct OpenVDBIntGrid;
struct OpenVDBVectorGrid;
+typedef struct OpenVDBReader OpenVDBReader;
+typedef struct OpenVDBWrite OpenVDBWrite;
+typedef struct OpenVDBFloatGrid OpenVDBFloatGrid;
+typedef struct OpenVDBIntGrid OpenVDBIntGrid;
+typedef struct OpenVDBVectorGrid OpenVDBVectorGrid;
+
int OpenVDB_getVersionHex(void);
enum {
@@ -99,6 +106,9 @@ void OpenVDBReader_get_meta_v3(struct OpenVDBReader *reader, const char *name, f
void OpenVDBReader_get_meta_v3_int(struct OpenVDBReader *reader, const char *name, int value[3]);
void OpenVDBReader_get_meta_mat4(struct OpenVDBReader *reader, const char *name, float value[4][4]);
+size_t OpenVDBReader_num_grids(struct OpenVDBReader *reader);
+const char *OpenVDBReader_grid_name(struct OpenVDBReader *reader, size_t index);
+
#ifdef __cplusplus
}
#endif
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index a9c0fd431eb..c300e3419a7 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -14,7 +14,7 @@
height="640"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
version="1.0"
sodipodi:docname="blender_icons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -31488,6 +31488,948 @@
offset="1"
id="stop3066" />
</linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32547"
+ gradientUnits="userSpaceOnUse"
+ x1="133.60002"
+ y1="118"
+ x2="128.8"
+ y2="114.8" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32549"
+ gradientUnits="userSpaceOnUse"
+ x1="135.46967"
+ y1="118"
+ x2="121.4286"
+ y2="101.14284" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32551"
+ gradientUnits="userSpaceOnUse"
+ x1="132.30316"
+ y1="123.05057"
+ x2="128.8"
+ y2="114.8" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32553"
+ gradientUnits="userSpaceOnUse"
+ x1="136.35806"
+ y1="124.27161"
+ x2="130.48389"
+ y2="118" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18134"
+ id="linearGradient32555"
+ gradientUnits="userSpaceOnUse"
+ x1="130.39502"
+ y1="116.31751"
+ x2="141.83322"
+ y2="132.30261" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32682"
+ gradientUnits="userSpaceOnUse"
+ x1="133.60002"
+ y1="118"
+ x2="128.8"
+ y2="114.8"
+ gradientTransform="matrix(0.41449745,0,0,0.41449732,3.272356,-82.276556)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32684"
+ gradientUnits="userSpaceOnUse"
+ x1="135.46967"
+ y1="118"
+ x2="121.4286"
+ y2="101.14284"
+ gradientTransform="matrix(0.29014874,0,0,0.29014768,23.33396,-63.955726)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32582-6"
+ gradientUnits="userSpaceOnUse"
+ x1="132.30316"
+ y1="123.05057"
+ x2="128.8"
+ y2="114.8"
+ gradientTransform="matrix(0.41449742,0,0,0.41449729,13.867831,-70.569949)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32687"
+ gradientUnits="userSpaceOnUse"
+ x1="136.35806"
+ y1="124.27161"
+ x2="130.48389"
+ y2="118"
+ gradientTransform="matrix(0.37304784,0,0,0.37304731,11.728084,-77.717048)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32698"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.3263918,0,0,1.3263918,-8.4154695,-15.628729)"
+ x1="31"
+ y1="60.000004"
+ x2="34"
+ y2="54.000004" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32700"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.41449745,0,0,0.41449732,3.272356,-82.276556)"
+ x1="133.60002"
+ y1="118"
+ x2="128.8"
+ y2="114.8" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32702"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.29014874,0,0,0.29014768,23.33396,-63.955726)"
+ x1="135.46967"
+ y1="118"
+ x2="121.4286"
+ y2="101.14284" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32704"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.37304784,0,0,0.37304731,11.728084,-77.717048)"
+ x1="136.35806"
+ y1="124.27161"
+ x2="130.48389"
+ y2="118" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319"
+ id="linearGradient32706"
+ gradientUnits="userSpaceOnUse"
+ x1="28.130203"
+ y1="65.791054"
+ x2="32.5"
+ y2="55.066181" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32798"
+ gradientUnits="userSpaceOnUse"
+ x1="133.60002"
+ y1="118"
+ x2="128.8"
+ y2="114.8"
+ gradientTransform="matrix(0.41449745,0,0,0.41449732,3.272356,-82.276556)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32800"
+ gradientUnits="userSpaceOnUse"
+ x1="135.46967"
+ y1="118"
+ x2="121.4286"
+ y2="101.14284"
+ gradientTransform="matrix(0.29014874,0,0,0.29014768,23.33396,-63.955726)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient35411"
+ id="linearGradient32803"
+ gradientUnits="userSpaceOnUse"
+ x1="136.35806"
+ y1="124.27161"
+ x2="130.48389"
+ y2="118"
+ gradientTransform="matrix(0.37304784,0,0,0.37304731,11.728084,-77.717048)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient63892"
+ id="linearGradient32935"
+ gradientUnits="userSpaceOnUse"
+ x1="136.35806"
+ y1="124.27161"
+ x2="129.08861"
+ y2="116.15625"
+ gradientTransform="matrix(0.37304784,0,0,0.37304731,11.728084,-77.717048)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient24081"
+ id="linearGradient32576"
+ gradientUnits="userSpaceOnUse"
+ x1="31"
+ y1="60.000004"
+ x2="34"
+ y2="54.000004"
+ gradientTransform="matrix(1.3263918,0,0,1.3263918,-8.4154695,-15.628729)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient17438"
+ id="linearGradient32578"
+ gradientUnits="userSpaceOnUse"
+ x1="133.60002"
+ y1="118"
+ x2="127.39986"
+ y2="112.21512"
+ gradientTransform="matrix(0.41449745,0,0,0.41449732,3.272356,-82.276556)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient63892"
+ id="linearGradient32580"
+ gradientUnits="userSpaceOnUse"
+ x1="135.46967"
+ y1="118"
+ x2="121.4286"
+ y2="101.14284"
+ gradientTransform="matrix(0.29014874,0,0,0.29014768,23.33396,-63.955726)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient63892"
+ id="linearGradient32582"
+ gradientUnits="userSpaceOnUse"
+ x1="132.30316"
+ y1="123.05057"
+ x2="126.79002"
+ y2="113.1464"
+ gradientTransform="matrix(0.41449742,0,0,0.41
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list