diff options
| author | Julian Eisel <julian@blender.org> | 2020-11-11 19:35:26 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-11-11 19:35:26 +0300 |
| commit | ca7079a44e773a26d6f6aa6730f53a16e7de6cd5 (patch) | |
| tree | b58ff6ccca5e2afd18da8365705f47112eac0a38 /source/blender/blenkernel/intern/volume.cc | |
| parent | fdd9cb713e2e96e430eb022f034bfa9973afc75c (diff) | |
| parent | 5b5ec0a2e910a42d7c02774a47fd9c70b6f16f06 (diff) | |
Merge branch 'master' into outliner-cpp-refactoroutliner-cpp-refactor
Diffstat (limited to 'source/blender/blenkernel/intern/volume.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/volume.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index bcd71e39b21..11aa9597740 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -1142,7 +1142,7 @@ VolumeGrid *BKE_volume_grid_get(const Volume *volume, int grid_index) return nullptr; #else UNUSED_VARS(volume, grid_index); - return NULL; + return nullptr; #endif } @@ -1409,7 +1409,7 @@ VolumeGrid *BKE_volume_grid_add(Volume *volume, const char *name, VolumeGridType return &grids.back(); #else UNUSED_VARS(volume, name, type); - return NULL; + return nullptr; #endif } |