diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-12-10 13:05:49 +0300 |
| commit | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (patch) | |
| tree | f03a5935ee7dbc4c7ddabaee1c06570a26f698f9 /source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | |
| parent | 390c4efa0c15b39e2d1971bc81464cffae56d102 (diff) | |
| parent | e795ba1529a28ec276a5178fda2025e5ec071bbf (diff) | |
Merge remote-tracking branch 'origin/master' into geometry-nodes
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 9cae343dcde..5af70305e13 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -25,8 +25,8 @@ #include "intern/builder/deg_builder_nodes.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include "MEM_guardedalloc.h" @@ -1247,8 +1247,7 @@ void DepsgraphNodeBuilder::build_particle_settings(ParticleSettings *particle_se &particle_settings->id, NodeType::PARTICLE_SETTINGS, OperationCode::PARTICLE_SETTINGS_EVAL); op_node->set_as_exit(); /* Texture slots. */ - for (int mtex_index = 0; mtex_index < MAX_MTEX; mtex_index++) { - MTex *mtex = particle_settings->mtex[mtex_index]; + for (MTex *mtex : particle_settings->mtex) { if (mtex == nullptr || mtex->tex == nullptr) { continue; } |