Commit: 7d1129e39a8f060f6e8969a6c7c84d64ec5122e5
Author: Sriharsha Kotcharlakot
Date: Thu Jun 25 17:57:22 2020 +0530
Branches: soc-2020-fluid-tools
https://developer.blender.org/rB7d1129e39a8f060f6e8969a6c7c84d64ec5122e5
Minor merge conflict resolution
===================================================================
M source/blender/makesdna/DNA_fluid_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_fluid_types.h
b/source/blender/makesdna/DNA_fluid_types.h
index 207351e8c19..0866ce44fb0 100644
--- a/source/blender/makesdna/DNA_fluid_types.h
+++ b/source/blender/makesdna/DNA_fluid_types.h
@@ -625,13 +625,13 @@ typedef struct FluidDomainSettings {
int openvdb_compression;
float clipping;
char openvdb_data_depth;
- char _pad9[7]; /* Unused. */
+ char _pad10[7]; /* Unused. */
/* -- Deprecated / unsed options (below). -- */
/* View options. */
int viewsettings;
- char _pad10[4]; /* Unused. */
+ char _pad11[4]; /* Unused. */
/* Pointcache options. */
/* Smoke uses only one cache from now on (index [0]), but keeping the array
for now for reading
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
