Cleanup: More obvious name for the flag
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Feb 2019 16:28:25 +0000 (17:28 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Feb 2019 16:29:01 +0000 (17:29 +0100)
Not sure what BIG is, it is HIGH RESOLUTION.

source/blender/blenkernel/intern/smoke.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/draw/engines/workbench/workbench_volume.c
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesrna/intern/rna_smoke.c

index 3c779b54c4d317f3f777a3c41997b1f6630661de..abe9aacf878aae990cb1779d2d612ad17a9708e6 100644 (file)
@@ -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
index 7dff415e12297e6de98fcac1c582ba127eb53212..930014979af1c949bff935b207ebd6d4bfbc2e85 100644 (file)
@@ -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));
index 37d176f5d5b630208e9a022afe7c3e1c88850bbf..da10733694554cf4c243a19365b9a8ec723f786d 100644 (file)
@@ -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);
        }
 
index 4436a17088ef34d4baf3d64cf3f0166be1623f0a..52009698a6530c76a9670bf446d21299c0a1e8c5 100644 (file)
@@ -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 {
index 6598a55d40dbcbdb3329a3aa571848e40537b5da..0f61c801e1b450ff10cc8a925dd0b2a2e9a59607 100644 (file)
@@ -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);