diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-15 19:28:25 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-15 19:29:01 +0300 |
commit | 14c00cda39dcae945611a3de34d9030b000f2649 (patch) | |
tree | 4ba395bb9e1b3d664f1a1d0246f36a5ef8b4545a | |
parent | f15d810b1fb7c995ee5b3a37e569db47041c393f (diff) |
Cleanup: More obvious name for the flag
Not sure what BIG is, it is HIGH RESOLUTION.
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_volume.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_smoke.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 3c779b54c4d..abe9aacf878 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -526,7 +526,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd) smd->domain->flame_smoke_color[1] = 0.7f; smd->domain->flame_smoke_color[2] = 0.7f; - smd->domain->viewsettings = MOD_SMOKE_VIEW_SHOWBIG; + smd->domain->viewsettings = MOD_SMOKE_VIEW_SHOW_HIGHRES; smd->domain->effector_weights = BKE_effector_add_weights(NULL); #ifdef WITH_OPENVDB_BLOSC diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 7dff415e122..930014979af 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -506,10 +506,10 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved const bool show_smoke = ((int)DEG_get_ctime(draw_ctx->depsgraph) >= sds->point_cache[0]->startframe); if (sds->fluid && show_smoke) { - if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) { + if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOW_HIGHRES)) { GPU_create_smoke(smd, 0); } - else if (sds->wt && (sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) { + else if (sds->wt && (sds->viewsettings & MOD_SMOKE_VIEW_SHOW_HIGHRES)) { GPU_create_smoke(smd, 1); } BLI_addtail(&e_data.smoke_domains, BLI_genericNodeN(smd)); diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c index 37d176f5d5b..da107336945 100644 --- a/source/blender/draw/engines/workbench/workbench_volume.c +++ b/source/blender/draw/engines/workbench/workbench_volume.c @@ -127,10 +127,10 @@ void workbench_volume_cache_populate(WORKBENCH_Data *vedata, Scene *scene, Objec if (sds->use_coba) { GPU_create_smoke_coba_field(smd); } - else if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) { + else if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOW_HIGHRES)) { GPU_create_smoke(smd, 0); } - else if (sds->wt && (sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) { + else if (sds->wt && (sds->viewsettings & MOD_SMOKE_VIEW_SHOW_HIGHRES)) { GPU_create_smoke(smd, 1); } diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index 4436a17088e..52009698a65 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -41,7 +41,7 @@ enum { #define MOD_SMOKE_NOISEFFT (1<<1) #define MOD_SMOKE_NOISECURL (1<<2) /* viewsettings */ -#define MOD_SMOKE_VIEW_SHOWBIG (1<<0) +#define MOD_SMOKE_VIEW_SHOW_HIGHRES (1<<0) /* slice method */ enum { diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 6598a55d40d..0f61c801e1b 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -555,7 +555,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset"); prop = RNA_def_property(srna, "show_high_resolution", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_VIEW_SHOWBIG); + RNA_def_property_boolean_sdna(prop, NULL, "viewsettings", MOD_SMOKE_VIEW_SHOW_HIGHRES); RNA_def_property_ui_text(prop, "Show High Resolution", "Show high resolution (using amplification)"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); |