Index: source/blender/blenkernel/intern/scene.c =================================================================== --- source/blender/blenkernel/intern/scene.c (revision 54977) +++ source/blender/blenkernel/intern/scene.c (working copy) @@ -391,34 +391,34 @@ sce->r.mode = R_GAMMA | R_OSA | R_SHADOW | R_SSS | R_ENVMAP | R_RAYTRACE; sce->r.cfra = 1; - sce->r.sfra = 1; - sce->r.efra = 250; - sce->r.frame_step = 1; - sce->r.xsch = 1920; - sce->r.ysch = 1080; - sce->r.xasp = 1; - sce->r.yasp = 1; - sce->r.tilex = 256; - sce->r.tiley = 256; - sce->r.mblur_samples = 1; - sce->r.filtertype = R_FILTER_MITCH; - sce->r.size = 50; + sce->r.sfra = SCENE_FRAME_START_DEFAULT; + sce->r.efra = SCENE_FRAME_END_DEFAULT; + sce->r.frame_step = SCENE_FRAME_STEP_DEFAULT; + sce->r.xsch = RENDERSETTINGS_RESOLUTION_X; + sce->r.ysch = RENDERSETTINGS_RESOLUTION_Y; + sce->r.xasp = RENDERSETTINGS_XASP_DEFAULT; + sce->r.yasp = RENDERSETTINGS_YASP_DEFAULT; + sce->r.tilex = RENDERSETTINGS_TILEX_DEFAULT; + sce->r.tiley = RENDERSETTINGS_TILEY_DEFAULT; + sce->r.mblur_samples = RENDERSETTINGS_MOTION_BLUR_SAMPLES_DEFAULT; + sce->r.filtertype = RENDERSETTINGS_PIXEL_FILTER_TYPE_DEFAULT; + sce->r.size = RENDERSETTINGS_RESOLUTION_PERCENTAGE_DEFAULT; - sce->r.im_format.planes = R_IMF_PLANES_RGB; - sce->r.im_format.imtype = R_IMF_IMTYPE_PNG; + sce->r.im_format.planes = IMAGEFORMATSETTINGS_COLOR_MODE_DEFAULT; + sce->r.im_format.imtype = IMAGEFORMATSETTINGS_FILE_FORMAT_DEFAULT; sce->r.im_format.depth = R_IMF_CHAN_DEPTH_8; - sce->r.im_format.quality = 90; - sce->r.im_format.compress = 90; + sce->r.im_format.quality = IMAGEFORMATSETTINGS_QUALITY_DEFAULT; + sce->r.im_format.compress = IMAGEFORMATSETTINGS_COMPRESSION_DEFAULT; - sce->r.displaymode = R_OUTPUT_AREA; - sce->r.framapto = 100; - sce->r.images = 100; - sce->r.framelen = 1.0; - sce->r.blurfac = 0.5; - sce->r.frs_sec = 24; - sce->r.frs_sec_base = 1; - sce->r.edgeint = 10; - sce->r.ocres = 128; + sce->r.displaymode = RENDERSETTINGS_DISPLAY_MODE_DEFAULT; + sce->r.framapto = RENDERSETTINGS_FRAME_MAP_OLD_DEFAULT; + sce->r.images = RENDERSETTINGS_FRAME_MAP_NEW_DEFAULT; + sce->r.framelen = RENDERSETTINGS_FRAMELEN_DEFAULT; + sce->r.blurfac = RENDERSETTINGS_MOTION_BLUR_SHUTTER_DEFAULT; + sce->r.frs_sec = RENDERSETTINGS_FRS_SEC_DEFAULT; + sce->r.frs_sec_base = RENDERSETTINGS_FRS_SEC_BASE_DEFAULT; + sce->r.edgeint = RENDERSETTINGS_EDGE_THRESHOLD_DEFAULT; + sce->r.ocres = RENDERSETTINGS_OCRES_DEFAULT; /* OCIO_TODO: for forwards compatibility only, so if no tonecurve are used, * images would look in the same way as in current blender @@ -507,12 +507,12 @@ sce->toolsettings->proportional_size = 1.0f; - sce->physics_settings.gravity[0] = 0.0f; - sce->physics_settings.gravity[1] = 0.0f; - sce->physics_settings.gravity[2] = -9.81f; + sce->physics_settings.gravity[0] = SCENE_GRAVITY_X_DEFAULT; + sce->physics_settings.gravity[1] = SCENE_GRAVITY_Y_DEFAULT; + sce->physics_settings.gravity[2] = SCENE_GRAVITY_Z_DEFAULT; sce->physics_settings.flag = PHYS_GLOBAL_GRAVITY; - sce->unit.scale_length = 1.0f; + sce->unit.scale_length = UNITSETTINGS_SCALE_LENGTH_DEFAULT; pset = &sce->toolsettings->particle; pset->flag = PE_KEEP_LENGTHS | PE_LOCK_FIRST | PE_DEFLECT_EMITTER | PE_AUTO_VELOCITY; @@ -531,22 +531,22 @@ } pset->brush[PE_BRUSH_CUT].strength = 100; - sce->r.ffcodecdata.audio_mixrate = 44100; - sce->r.ffcodecdata.audio_volume = 1.0f; - sce->r.ffcodecdata.audio_bitrate = 192; - sce->r.ffcodecdata.audio_channels = 2; + sce->r.ffcodecdata.audio_mixrate = FFMPEGSETTINGS_AUDIO_MIXRATE_DEFAULT; + sce->r.ffcodecdata.audio_volume = FFMPEGSETTINGS_AUDIO_VOLUME_DEFAULT; + sce->r.ffcodecdata.audio_bitrate = FFMPEGSETTINGS_AUDIO_BITRATE_DEFAULT; + sce->r.ffcodecdata.audio_channels = FFMPEGSETTINGS_AUDIO_CHANNELS_DEFAULT; BLI_strncpy(sce->r.engine, "BLENDER_RENDER", sizeof(sce->r.engine)); - sce->audio.distance_model = 2.0f; - sce->audio.doppler_factor = 1.0f; - sce->audio.speed_of_sound = 343.3f; - sce->audio.volume = 1.0f; + sce->audio.distance_model = SCENE_AUDIO_DISTANCE_MODEL_DEFAULT; + sce->audio.doppler_factor = SCENE_AUDIO_DOPPLER_FACTOR_DEFAULT; + sce->audio.speed_of_sound = SCENE_AUDIO_DOPPLER_SPEED_DEFAULT; + sce->audio.volume = SCENE_AUDIO_VOLUME_DEFAULT; BLI_strncpy(sce->r.pic, U.renderdir, sizeof(sce->r.pic)); BLI_rctf_init(&sce->r.safety, 0.1f, 0.9f, 0.1f, 0.9f); - sce->r.osa = 8; + sce->r.osa = RENDERSETTINGS_ANTIALIASING_SAMPLES_DEFAULT; /* note; in header_info.c the scene copy happens..., if you add more to renderdata it has to be checked there */ BKE_scene_add_render_layer(sce, NULL); @@ -562,10 +562,10 @@ sce->gm.dome.resbuf = 1.0f; sce->gm.dome.tilt = 0; - sce->gm.xplay = 640; - sce->gm.yplay = 480; - sce->gm.freqplay = 60; - sce->gm.depth = 32; + sce->gm.xplay = SCENEGAMEDATA_RESOLUTION_X_DEFAULT; + sce->gm.yplay = SCENEGAMEDATA_RESOLUTION_Y_DEFAULT; + sce->gm.freqplay = SCENEGAMEDATA_FREQPLAY_DEFAULT; + sce->gm.depth = SCENEGAMEDATA_DEPTH_DEFAULT; sce->gm.gravity = 9.8f; sce->gm.physicsEngine = WOPHY_BULLET; Index: source/blender/makesdna/DNA_scene_types.h =================================================================== --- source/blender/makesdna/DNA_scene_types.h (revision 54977) +++ source/blender/makesdna/DNA_scene_types.h (working copy) @@ -1636,6 +1636,154 @@ #define USER_UNIT_OPT_SPLIT 1 #define USER_UNIT_ROT_RADIANS 2 +/* Defaults */ + +#define SCENE_GRAVITY_X_DEFAULT 0.0f +#define SCENE_GRAVITY_Y_DEFAULT 0.0f +#define SCENE_GRAVITY_Z_DEFAULT -9.80665 +#define SCENE_FRAME_START_DEFAULT 1 +#define SCENE_FRAME_END_DEFAULT 250 +#define SCENE_FRAME_STEP_DEFAULT 1 +#define SCENE_AUDIO_DOPPLER_SPEED_DEFAULT 343.300f +#define SCENE_AUDIO_DOPPLER_FACTOR_DEFAULT 1.0f +#define SCENE_AUDIO_DISTANCE_MODEL_DEFAULT 2 +#define SCENE_AUDIO_VOLUME_DEFAULT 1.0f + +/* UnifiedPaintSettings Defaults */ +#define UNIFIEDPAINTSETTINGS_STRENGTH_DEFAULT 0.5f +#define UNIFIEDPAINTSETTINGS_WEIGHT_DEFAULT 0.5f + +/* Unit Settings Defaults */ +#define UNITSETTINGS_SCALE_LENGTH_DEFAULT 1.0f +#define UNITSETTINGS_USE_SEPARATE_DEFAULT FALSE + +/* RenderLayer Defaults */ +#define RENDERLAYER_USE_ZMASK_DEFAULT FALSE +#define RENDERLAYER_INVERT_ZMASK_DEFAULT FALSE +#define RENDERLAYER_USE_ALL_Z_DEFAULT FALSE +#define RENDERLAYER_USE_SOLID_DEFAULT TRUE +#define RENDERLAYER_USE_HALO_DEFAULT TRUE +#define RENDERLAYER_USE_ZTRANSP_DEFAULT TRUE +#define RENDERLAYER_USE_SKY_DEFAULT TRUE +#define RENDERLAYER_USE_EDGE_ENHANCE_DEFAULT TRUE +#define RENDERLAYER_USE_STRAND_DEFAULT TRUE +#define RENDERLAYER_USE_PASS_COMBINED_DEFAULT TRUE +#define RENDERLAYER_USE_PASS_Z_DEFAULT TRUE +#define RENDERLAYER_USE_PASS_VECTOR_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_NORMAL_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_UV_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_MIST_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_OBJECT_INDEX_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_MATERIAL_INDEX_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_COLOR_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_DIFFUSE_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_SPECULAR_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_SHADOW_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_AMBIENT_OCCLUSION_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_REFLECTION_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_REFRACTION_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_EMIT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_ENVIRONMENT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_INDIRECT_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_SPECULAR_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_SHADOW_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_AMBIENT_OCCLUSION_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_REFLECTION_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_REFRACTION_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_EMIT_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_ENVIRONMENT_DEFAULT FALSE +#define RENDERLAYER_EXCLUDE_INDIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_DIFFUSE_DIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_DIFFUSE_INDIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_DIFFUSE_COLOR_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_GLOSSY_DIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_GLOSSY_INDIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_GLOSSY_COLOR_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_TRANSMISSION_DIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_TRANSMISSION_INDIRECT_DEFAULT FALSE +#define RENDERLAYER_USE_PASS_TRANSMISSION_COLOR_DEFAULT FALSE + +/* SceneGameData Defaults */ +#define SCENEGAMEDATA_RESOLUTION_X_DEFAULT 640 +#define SCENEGAMEDATA_RESOLUTION_Y_DEFAULT 480 +#define SCENEGAMEDATA_FREQPLAY_DEFAULT 60 +#define SCENEGAMEDATA_DEPTH_DEFAULT 32 + +/* ImageFormatSettings Defaults */ +#define IMAGEFORMATSETTINGS_FILE_FORMAT_DEFAULT R_IMF_IMTYPE_PNG +#define IMAGEFORMATSETTINGS_COLOR_MODE_DEFAULT R_IMF_PLANES_RGB +#define IMAGEFORMATSETTINGS_QUALITY_DEFAULT 90 +#define IMAGEFORMATSETTINGS_COMPRESSION_DEFAULT 90 + +/* FFmpegSettings Defaults */ +#define FFMPEGSETTINGS_AUDIO_VOLUME_DEFAULT 1.0f +#define FFMPEGSETTINGS_AUDIO_MIXRATE_DEFAULT 44100 +#define FFMPEGSETTINGS_AUDIO_CHANNELS_DEFAULT 2 +#define FFMPEGSETTINGS_AUDIO_BITRATE_DEFAULT 192 + +/* RenderSettings Defaults */ +#define RENDERSETTINGS_RESOLUTION_X 1920 +#define RENDERSETTINGS_RESOLUTION_Y 1080 +#define RENDERSETTINGS_RESOLUTION_PERCENTAGE_DEFAULT 50 +#define RENDERSETTINGS_TILEX_DEFAULT 64 +#define RENDERSETTINGS_TILEY_DEFAULT 64 +#define RENDERSETTINGS_XASP_DEFAULT 1 +#define RENDERSETTINGS_YASP_DEFAULT 1 +#define RENDERSETTINGS_FRAMELEN_DEFAULT 1.0f +#define RENDERSETTINGS_FRS_SEC_DEFAULT 24 +#define RENDERSETTINGS_FRS_SEC_BASE_DEFAULT 1 +#define RENDERSETTINGS_OCRES_DEFAULT 128 +#define RENDERSETTINGS_FRAME_MAP_OLD_DEFAULT 100 +#define RENDERSETTINGS_FRAME_MAP_NEW_DEFAULT 100 +#define RENDERSETTINGS_PIXEL_FILTER_TYPE_DEFAULT R_FILTER_MITCH +#define RENDERSETTINGS_FILTER_SIZE_DEFAULT 1.0f +#define RENDERSETTINGS_USE_INSTANCES_DEFAULT TRUE +#define RENDERSETTINGS_USE_LOCAL_COORDS_DEFAULT FALSE +#define RENDERSETTINGS_ANTIALIASING_SAMPLES_DEFAULT 8 +#define RENDERSETTINGS_USE_FIELDS_DEFAULT FALSE +#define RENDERSETTINGS_USE_FIELDS_STILL_DEFAULT FALSE +#define RENDERSETTINGS_USE_SHADOWS_DEFAULT TRUE +#define RENDERSETTINGS_USE_ENVMAPS_DEFAULT TRUE +#define RENDERSETTINGS_USE_SSS_DEFAULT TRUE +#define RENDERSETTINGS_USE_RAYTRACE_DEFAULT TRUE +#define RENDERSETTINGS_USE_TEXTURES_DEFAULT TRUE +#define RENDERSETTINGS_USE_EDGE_ENHANCE_DEFAULT FALSE +#define RENDERSETTINGS_EDGE_THRESHOLD_DEFAULT 10 +#define RENDERSETTINGS_MOTION_BLUR_SAMPLES_DEFAULT 1 +#define RENDERSETTINGS_MOTION_BLUR_SHUTTER_DEFAULT 0.5f +#define RENDERSETTINGS_USE_BORDER_DEFAULT FALSE +#define RENDERSETTINGS_USE_CROP_TO_BORDER_DEFAULT FALSE +#define RENDERSETTINGS_USE_PLACEHOLDER_DEFAULT FALSE +#define RENDERSETTINGS_USE_OVERWRITE_DEFAULT TRUE +#define RENDERSETTINGS_USE_COMPOSITING_DEFAULT TRUE +#define RENDERSETTINGS_USE_SEQUENCER_DEFAULT TRUE +#define RENDERSETTINGS_USE_FILE_EXTENSION_DEFAULT TRUE +#define RENDERSETTINGS_USE_FREE_IMAGE_TEXTURES_DEFAULT FALSE +#define RENDERSETTINGS_USE_FREE_UNUSED_NODES_DEFAULT FALSE +#define RENDERSETTINGS_USE_SAVE_BUFFERS_DEFAULT FALSE +#define RENDERSETTINGS_USE_FULL_SAMPLE_DEFAULT FALSE +#define RENDERSETTINGS_DISPLAY_MODE_DEFAULT R_OUTPUT_AREA +#define RENDERSETTINGS_USE_BAKE_SELECTED_TO_ACTIVE_DEFAULT FALSE +#define RENDERSETTINGS_USE_BAKE_CLEAR_DEFAULT TRUE +#define RENDERSETTINGS_BAKE_MARGIN_DEFAULT 2 +#define RENDERSETTINGS_USE_STAMP_TIME_DEFAULT TRUE +#define RENDERSETTINGS_USE_STAMP_DATE_DEFAULT TRUE +#define RENDERSETTINGS_USE_STAMP_FRAME_DEFAULT TRUE +#define RENDERSETTINGS_USE_STAMP_CAMERA_DEFAULT TRUE +#define RENDERSETTINGS_USE_STAMP_LENS_DEFAULT FALSE +#define RENDERSETTINGS_USE_STAMP_SCENE_DEFAULT TRUE +#define RENDERSETTINGS_USE_STAMP_NOTE_DEFAULT FALSE +#define RENDERSETTINGS_USE_STAMP_MARKER_DEFAULT FALSE +#define RENDERSETTINGS_USE_STAMP_FILENAME_DEFAULT TRUE +#define RENDERSETTINGS_USE_STAMP_SEQUENCER_STRIP_DEFAULT FALSE +#define RENDERSETTINGS_USE_STAMP_RENDER_TIME_DEFAULT TRUE +#define RENDERSETTINGS_STAMP_FONT_SIZE_DEFAULT 12 +#define RENDERSETTINGS_SIMPLIFY_SUBDIVISION_DEFAULT 6 +#define RENDERSETTINGS_SIMPLIFY_CHILD_PARTICLES_DEFAULT 1.0f +#define RENDERSETTINGS_SIMPLIFY_SHADOW_SAMPLES_DEFAULT 16 +#define RENDERSETTINGS_SIMPLIFY_AO_SSS_DEFAULT 1.0f +#define RENDERSETTINGS_USE_SIMPLIFY_TRIANGULATE_DEFAULT FALSE + #ifdef __cplusplus } #endif Index: source/blender/makesrna/intern/rna_scene.c =================================================================== --- source/blender/makesrna/intern/rna_scene.c (revision 54977) +++ source/blender/makesrna/intern/rna_scene.c (working copy) @@ -1893,14 +1893,14 @@ prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "alpha"); - RNA_def_property_float_default(prop, 0.5f); + RNA_def_property_float_default(prop, UNIFIEDPAINTSETTINGS_STRENGTH_DEFAULT); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3); RNA_def_property_ui_text(prop, "Strength", "How powerful the effect of the brush is when applied"); prop = RNA_def_property(srna, "weight", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "weight"); - RNA_def_property_float_default(prop, 0.5f); + RNA_def_property_float_default(prop, UNIFIEDPAINTSETTINGS_WEIGHT_DEFAULT); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3); RNA_def_property_ui_text(prop, "Weight", "Weight to assign in vertex groups"); @@ -1958,10 +1958,12 @@ RNA_def_property_ui_text(prop, "Unit Scale", "Scale to use when converting between blender units and dimensions"); RNA_def_property_range(prop, 0.00001, 100000.0); RNA_def_property_ui_range(prop, 0.001, 100.0, 0.1, 3); + RNA_def_property_float_default(prop, UNITSETTINGS_SCALE_LENGTH_DEFAULT); RNA_def_property_update(prop, NC_WINDOW, NULL); prop = RNA_def_property(srna, "use_separate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_UNIT_OPT_SPLIT); + RNA_def_property_boolean_default(prop, UNITSETTINGS_USE_SEPARATE_DEFAULT); RNA_def_property_ui_text(prop, "Separate Units", "Display units in pairs (e.g. 1m 0cm)"); RNA_def_property_update(prop, NC_WINDOW, NULL); } @@ -2035,12 +2037,14 @@ prop = RNA_def_property(srna, "use_zmask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZMASK); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_ZMASK_DEFAULT); RNA_def_property_ui_text(prop, "Zmask", "Only render what's in front of the solid z values"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "invert_zmask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_NEG_ZMASK); + RNA_def_property_boolean_default(prop, RENDERLAYER_INVERT_ZMASK_DEFAULT); RNA_def_property_ui_text(prop, "Zmask Negate", "For Zmask, only render what is behind solid z values instead of in front"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update"); @@ -2048,42 +2052,49 @@ prop = RNA_def_property(srna, "use_all_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ALL_Z); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_ALL_Z_DEFAULT); RNA_def_property_ui_text(prop, "All Z", "Fill in Z values for solid faces in invisible layers, for masking"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_solid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_SOLID); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_SOLID_DEFAULT); RNA_def_property_ui_text(prop, "Solid", "Render Solid faces in this Layer"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_halo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_HALO); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_HALO_DEFAULT); RNA_def_property_ui_text(prop, "Halo", "Render Halos in this Layer (on top of Solid)"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_ztransp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZTRA); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_ZTRANSP_DEFAULT); RNA_def_property_ui_text(prop, "ZTransp", "Render Z-Transparent faces in this Layer (on top of Solid and Halos)"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_sky", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_SKY); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_SKY_DEFAULT); RNA_def_property_ui_text(prop, "Sky", "Render Sky in this Layer"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_edge_enhance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_EDGE); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_EDGE_ENHANCE_DEFAULT); RNA_def_property_ui_text(prop, "Edge", "Render Edge-enhance in this Layer (only works for Solid faces)"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_strand", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_STRAND); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_STRAND_DEFAULT); RNA_def_property_ui_text(prop, "Strand", "Render Strands in this Layer"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -2091,114 +2102,133 @@ /* passes */ prop = RNA_def_property(srna, "use_pass_combined", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_COMBINED); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_COMBINED_DEFAULT); RNA_def_property_ui_text(prop, "Combined", "Deliver full combined RGBA buffer"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_Z); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_Z_DEFAULT); RNA_def_property_ui_text(prop, "Z", "Deliver Z values pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_vector", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_VECTOR); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_VECTOR_DEFAULT); RNA_def_property_ui_text(prop, "Vector", "Deliver speed vector pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_NORMAL); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_NORMAL_DEFAULT); RNA_def_property_ui_text(prop, "Normal", "Deliver normal pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_UV); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_UV_DEFAULT); RNA_def_property_ui_text(prop, "UV", "Deliver texture UV pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_mist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_MIST); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_MIST_DEFAULT); RNA_def_property_ui_text(prop, "Mist", "Deliver mist factor pass (0.0-1.0)"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_object_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXOB); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_OBJECT_INDEX_DEFAULT); RNA_def_property_ui_text(prop, "Object Index", "Deliver object index pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_material_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXMA); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_MATERIAL_INDEX_DEFAULT); RNA_def_property_ui_text(prop, "Material Index", "Deliver material index pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_RGBA); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_COLOR_DEFAULT); RNA_def_property_ui_text(prop, "Color", "Deliver shade-less color pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_DIFFUSE_DEFAULT); RNA_def_property_ui_text(prop, "Diffuse", "Deliver diffuse pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SPEC); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_SPECULAR_DEFAULT); RNA_def_property_ui_text(prop, "Specular", "Deliver specular pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SHADOW); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_SHADOW_DEFAULT); RNA_def_property_ui_text(prop, "Shadow", "Deliver shadow pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_AO); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_AMBIENT_OCCLUSION_DEFAULT); RNA_def_property_ui_text(prop, "AO", "Deliver AO pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFLECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_REFLECTION_DEFAULT); RNA_def_property_ui_text(prop, "Reflection", "Deliver raytraced reflection pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFRACT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_REFRACTION_DEFAULT); RNA_def_property_ui_text(prop, "Refraction", "Deliver raytraced refraction pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_EMIT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_EMIT_DEFAULT); RNA_def_property_ui_text(prop, "Emit", "Deliver emission pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_ENVIRONMENT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_ENVIRONMENT_DEFAULT); RNA_def_property_ui_text(prop, "Environment", "Deliver environment lighting pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_INDIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Indirect", "Deliver indirect lighting pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "exclude_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SPEC); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_SPECULAR_DEFAULT); RNA_def_property_ui_text(prop, "Specular Exclude", "Exclude specular pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2206,6 +2236,7 @@ prop = RNA_def_property(srna, "exclude_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SHADOW); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_SHADOW_DEFAULT); RNA_def_property_ui_text(prop, "Shadow Exclude", "Exclude shadow pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2213,6 +2244,7 @@ prop = RNA_def_property(srna, "exclude_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_AO); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_AMBIENT_OCCLUSION_DEFAULT); RNA_def_property_ui_text(prop, "AO Exclude", "Exclude AO pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2220,6 +2252,7 @@ prop = RNA_def_property(srna, "exclude_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFLECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_REFLECTION_DEFAULT); RNA_def_property_ui_text(prop, "Reflection Exclude", "Exclude raytraced reflection pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2227,6 +2260,7 @@ prop = RNA_def_property(srna, "exclude_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFRACT); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_REFRACTION_DEFAULT); RNA_def_property_ui_text(prop, "Refraction Exclude", "Exclude raytraced refraction pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2234,6 +2268,7 @@ prop = RNA_def_property(srna, "exclude_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_EMIT); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_EMIT_DEFAULT); RNA_def_property_ui_text(prop, "Emit Exclude", "Exclude emission pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2241,6 +2276,7 @@ prop = RNA_def_property(srna, "exclude_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_ENVIRONMENT); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_ENVIRONMENT_DEFAULT); RNA_def_property_ui_text(prop, "Environment Exclude", "Exclude environment pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2248,6 +2284,7 @@ prop = RNA_def_property(srna, "exclude_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_INDIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_EXCLUDE_INDIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Indirect Exclude", "Exclude indirect pass from combined"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); @@ -2255,54 +2292,63 @@ prop = RNA_def_property(srna, "use_pass_diffuse_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_DIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_DIFFUSE_DIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Diffuse Direct", "Deliver diffuse direct pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_INDIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_DIFFUSE_INDIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Diffuse Indirect", "Deliver diffuse indirect pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_diffuse_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_COLOR); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_DIFFUSE_COLOR_DEFAULT); RNA_def_property_ui_text(prop, "Diffuse Color", "Deliver diffuse color pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_glossy_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_DIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_GLOSSY_DIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Glossy Direct", "Deliver glossy direct pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_glossy_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_INDIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_GLOSSY_INDIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Glossy Indirect", "Deliver glossy indirect pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_glossy_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_COLOR); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_GLOSSY_COLOR_DEFAULT); RNA_def_property_ui_text(prop, "Glossy Color", "Deliver glossy color pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_transmission_direct", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_DIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_TRANSMISSION_DIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Transmission Direct", "Deliver transmission direct pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_transmission_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_INDIRECT); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_TRANSMISSION_INDIRECT_DEFAULT); RNA_def_property_ui_text(prop, "Transmission Indirect", "Deliver transmission indirect pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "use_pass_transmission_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_COLOR); + RNA_def_property_boolean_default(prop, RENDERLAYER_USE_PASS_TRANSMISSION_COLOR_DEFAULT); RNA_def_property_ui_text(prop, "Transmission Color", "Deliver transmission color pass"); if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -2486,12 +2532,14 @@ prop = RNA_def_property(srna, "resolution_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "xplay"); RNA_def_property_range(prop, 4, 10000); + RNA_def_property_int_default(prop, SCENEGAMEDATA_RESOLUTION_X_DEFAULT); RNA_def_property_ui_text(prop, "Resolution X", "Number of horizontal pixels in the screen"); RNA_def_property_update(prop, NC_SCENE, NULL); prop = RNA_def_property(srna, "resolution_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "yplay"); RNA_def_property_range(prop, 4, 10000); + RNA_def_property_int_default(prop, SCENEGAMEDATA_RESOLUTION_Y_DEFAULT); RNA_def_property_ui_text(prop, "Resolution Y", "Number of vertical pixels in the screen"); RNA_def_property_update(prop, NC_SCENE, NULL); @@ -2503,6 +2551,7 @@ prop = RNA_def_property(srna, "depth", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "depth"); RNA_def_property_range(prop, 8, 32); + RNA_def_property_int_default(prop, SCENEGAMEDATA_DEPTH_DEFAULT); RNA_def_property_ui_text(prop, "Bits", "Display bit depth of full screen display"); RNA_def_property_update(prop, NC_SCENE, NULL); @@ -2523,6 +2572,7 @@ prop = RNA_def_property(srna, "frequency", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "freqplay"); RNA_def_property_range(prop, 4, 2000); + RNA_def_property_int_default(prop, SCENEGAMEDATA_FREQPLAY_DEFAULT); RNA_def_property_ui_text(prop, "Freq", "Display clock frequency of fullscreen display"); RNA_def_property_update(prop, NC_SCENE, NULL); @@ -2935,6 +2985,7 @@ prop = RNA_def_property(srna, "file_format", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "imtype"); RNA_def_property_enum_items(prop, image_type_items); + RNA_def_property_enum_default(prop, IMAGEFORMATSETTINGS_FILE_FORMAT_DEFAULT); RNA_def_property_enum_funcs(prop, NULL, "rna_ImageFormatSettings_file_format_set", "rna_ImageFormatSettings_file_format_itemf"); RNA_def_property_ui_text(prop, "File Format", "File format to save the rendered images as"); @@ -2943,6 +2994,7 @@ prop = RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "planes"); RNA_def_property_enum_items(prop, image_color_mode_items); + RNA_def_property_enum_default(prop, IMAGEFORMATSETTINGS_COLOR_MODE_DEFAULT); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_ImageFormatSettings_color_mode_itemf"); RNA_def_property_ui_text(prop, "Color Mode", "Choose BW for saving grayscale images, RGB for saving red, green and blue channels, " @@ -2960,6 +3012,7 @@ prop = RNA_def_property(srna, "quality", PROP_INT, PROP_PERCENTAGE); RNA_def_property_int_sdna(prop, NULL, "quality"); RNA_def_property_range(prop, 0, 100); /* 0 is needed for compression. */ + RNA_def_property_int_default(prop, IMAGEFORMATSETTINGS_QUALITY_DEFAULT); RNA_def_property_ui_text(prop, "Quality", "Quality for image formats that support lossy compression"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -2967,6 +3020,7 @@ prop = RNA_def_property(srna, "compression", PROP_INT, PROP_PERCENTAGE); RNA_def_property_int_sdna(prop, NULL, "compress"); RNA_def_property_range(prop, 0, 100); /* 0 is needed for compression. */ + RNA_def_property_int_default(prop, IMAGEFORMATSETTINGS_COMPRESSION_DEFAULT); RNA_def_property_ui_text(prop, "Compression", "Compression level for formats that support lossless compression"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3206,6 +3260,7 @@ RNA_def_property_int_sdna(prop, NULL, "audio_bitrate"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 32, 384); + RNA_def_property_int_default(prop, FFMPEGSETTINGS_AUDIO_BITRATE_DEFAULT); RNA_def_property_ui_text(prop, "Bitrate", "Audio bitrate (kb/s)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3213,6 +3268,7 @@ RNA_def_property_float_sdna(prop, NULL, "audio_volume"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_float_default(prop, FFMPEGSETTINGS_AUDIO_VOLUME_DEFAULT); RNA_def_property_ui_text(prop, "Volume", "Audio volume"); RNA_def_property_translation_context(prop, BLF_I18NCONTEXT_ID_SOUND); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3223,11 +3279,13 @@ RNA_def_property_int_sdna(prop, NULL, "audio_mixrate"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 8000, 192000); + RNA_def_property_int_default(prop, FFMPEGSETTINGS_AUDIO_MIXRATE_DEFAULT); RNA_def_property_ui_text(prop, "Samplerate", "Audio samplerate(samples/s)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "audio_channels", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "audio_channels"); + RNA_def_property_enum_default(prop, FFMPEGSETTINGS_AUDIO_CHANNELS_DEFAULT); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_enum_items(prop, audio_channel_items); RNA_def_property_ui_text(prop, "Audio Channels", "Audio channel count"); @@ -3464,6 +3522,7 @@ RNA_def_property_int_sdna(prop, NULL, "xsch"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 4, 65536); + RNA_def_property_int_default(prop, RENDERSETTINGS_RESOLUTION_X); RNA_def_property_ui_text(prop, "Resolution X", "Number of horizontal pixels in the rendered image"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneCamera_update"); @@ -3471,6 +3530,7 @@ RNA_def_property_int_sdna(prop, NULL, "ysch"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 4, 65536); + RNA_def_property_int_default(prop, RENDERSETTINGS_RESOLUTION_Y); RNA_def_property_ui_text(prop, "Resolution Y", "Number of vertical pixels in the rendered image"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneCamera_update"); @@ -3479,18 +3539,21 @@ RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, SHRT_MAX); RNA_def_property_ui_range(prop, 1, 100, 10, 1); + RNA_def_property_int_default(prop, RENDERSETTINGS_RESOLUTION_PERCENTAGE_DEFAULT); RNA_def_property_ui_text(prop, "Resolution %", "Percentage scale for render resolution"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "tile_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "tilex"); RNA_def_property_range(prop, 8, 65536); + RNA_def_property_int_default(prop, RENDERSETTINGS_TILEX_DEFAULT); RNA_def_property_ui_text(prop, "Tile X", "Horizontal tile size to use while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "tile_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "tiley"); RNA_def_property_range(prop, 8, 65536); + RNA_def_property_int_default(prop, RENDERSETTINGS_TILEY_DEFAULT); RNA_def_property_ui_text(prop, "Tile Y", "Vertical tile size to use while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3498,6 +3561,7 @@ RNA_def_property_float_sdna(prop, NULL, "xasp"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1.0f, 200.0f); + RNA_def_property_float_default(prop, RENDERSETTINGS_XASP_DEFAULT); RNA_def_property_ui_text(prop, "Pixel Aspect X", "Horizontal aspect ratio - for anamorphic or non-square pixel output"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneCamera_update"); @@ -3506,6 +3570,7 @@ RNA_def_property_float_sdna(prop, NULL, "yasp"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1.0f, 200.0f); + RNA_def_property_float_default(prop, RENDERSETTINGS_YASP_DEFAULT); RNA_def_property_ui_text(prop, "Pixel Aspect Y", "Vertical aspect ratio - for anamorphic or non-square pixel output"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneCamera_update"); @@ -3528,6 +3593,7 @@ RNA_def_property_int_sdna(prop, NULL, "frs_sec"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 120); + RNA_def_property_int_default(prop, RENDERSETTINGS_FRS_SEC_DEFAULT); RNA_def_property_ui_text(prop, "FPS", "Framerate, expressed in frames per second"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_fps_update"); @@ -3535,6 +3601,7 @@ RNA_def_property_float_sdna(prop, NULL, "frs_sec_base"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.1f, 120.0f); + RNA_def_property_float_default(prop, RENDERSETTINGS_FRS_SEC_BASE_DEFAULT); RNA_def_property_ui_text(prop, "FPS Base", "Framerate base"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_fps_update"); @@ -3543,6 +3610,7 @@ RNA_def_property_int_sdna(prop, NULL, "framapto"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 900); + RNA_def_property_int_default(prop, RENDERSETTINGS_FRAME_MAP_OLD_DEFAULT); RNA_def_property_ui_text(prop, "Frame Map Old", "Old mapping value in frames"); RNA_def_property_update(prop, NC_SCENE | ND_FRAME, "rna_Scene_framelen_update"); @@ -3550,6 +3618,7 @@ RNA_def_property_int_sdna(prop, NULL, "images"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 900); + RNA_def_property_int_default(prop, RENDERSETTINGS_FRAME_MAP_NEW_DEFAULT); RNA_def_property_ui_text(prop, "Frame Map New", "How many frames the Map Old will last"); RNA_def_property_update(prop, NC_SCENE | ND_FRAME, "rna_Scene_framelen_update"); @@ -3564,12 +3633,14 @@ prop = RNA_def_property(srna, "pixel_filter_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "filtertype"); RNA_def_property_enum_items(prop, pixel_filter_items); + RNA_def_property_enum_default(prop, RENDERSETTINGS_PIXEL_FILTER_TYPE_DEFAULT); RNA_def_property_ui_text(prop, "Pixel Filter", "Reconstruction filter used for combining anti-aliasing samples"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "filter_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "gauss"); RNA_def_property_range(prop, 0.5f, 1.5f); + RNA_def_property_float_default(prop, RENDERSETTINGS_FILTER_SIZE_DEFAULT); RNA_def_property_ui_text(prop, "Filter Size", "Pixel width over which the reconstruction filter combines samples"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3582,6 +3653,7 @@ prop = RNA_def_property(srna, "octree_resolution", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ocres"); RNA_def_property_enum_items(prop, octree_resolution_items); + RNA_def_property_enum_default(prop, RENDERSETTINGS_OCRES_DEFAULT); RNA_def_property_ui_text(prop, "Octree Resolution", "Resolution of raytrace accelerator, use higher resolutions for larger scenes"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3594,12 +3666,14 @@ prop = RNA_def_property(srna, "use_instances", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "raytrace_options", R_RAYTRACE_USE_INSTANCES); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_INSTANCES_DEFAULT); RNA_def_property_ui_text(prop, "Use Instances", "Instance support leads to effective memory reduction when using duplicates"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_local_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "raytrace_options", R_RAYTRACE_USE_LOCAL_COORDS); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_LOCAL_COORDS_DEFAULT); RNA_def_property_ui_text(prop, "Use Local Coords", "Vertex coordinates are stored locally on each primitive " "(increases memory usage, but may have impact on speed)"); @@ -3614,11 +3688,13 @@ prop = RNA_def_property(srna, "antialiasing_samples", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "osa"); RNA_def_property_enum_items(prop, fixed_oversample_items); + RNA_def_property_enum_default(prop, RENDERSETTINGS_ANTIALIASING_SAMPLES_DEFAULT); RNA_def_property_ui_text(prop, "Anti-Aliasing Samples", "Amount of anti-aliasing samples per pixel"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_fields", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_FIELDS); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_FIELDS_DEFAULT); RNA_def_property_ui_text(prop, "Fields", "Render image to two fields per frame, for interlaced TV output"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3632,17 +3708,20 @@ prop = RNA_def_property(srna, "use_fields_still", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_FIELDSTILL); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_FIELDS_STILL_DEFAULT); RNA_def_property_ui_text(prop, "Fields Still", "Disable the time difference between fields"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); /* rendering features */ prop = RNA_def_property(srna, "use_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SHADOW); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_SHADOWS_DEFAULT); RNA_def_property_ui_text(prop, "Shadows", "Calculate shadows while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_envmaps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_ENVMAP); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_ENVMAPS_DEFAULT); RNA_def_property_ui_text(prop, "Environment Maps", "Calculate environment maps while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3655,28 +3734,33 @@ prop = RNA_def_property(srna, "use_sss", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SSS); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_SSS_DEFAULT); RNA_def_property_ui_text(prop, "Subsurface Scattering", "Calculate sub-surface scattering in materials rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_raytrace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_RAYTRACE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_RAYTRACE_DEFAULT); RNA_def_property_ui_text(prop, "Raytracing", "Pre-calculate the raytrace accelerator and render raytracing effects"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "scemode", R_NO_TEX); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_TEXTURES_DEFAULT); RNA_def_property_ui_text(prop, "Textures", "Use textures to affect material properties"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_edge_enhance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_EDGE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_EDGE_ENHANCE_DEFAULT); RNA_def_property_ui_text(prop, "Edge", "Create a toon outline around the edges of geometry"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "edge_threshold", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "edgeint"); RNA_def_property_range(prop, 0, 255); + RNA_def_property_int_default(prop, RENDERSETTINGS_EDGE_THRESHOLD_DEFAULT); RNA_def_property_ui_text(prop, "Edge Threshold", "Threshold for drawing outlines on geometry edges"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3712,6 +3796,7 @@ prop = RNA_def_property(srna, "motion_blur_samples", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "mblur_samples"); RNA_def_property_range(prop, 1, 32); + RNA_def_property_int_default(prop, RENDERSETTINGS_MOTION_BLUR_SAMPLES_DEFAULT); RNA_def_property_ui_text(prop, "Motion Samples", "Number of scene samples to take with motion blur"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update"); @@ -3719,6 +3804,7 @@ prop = RNA_def_property(srna, "motion_blur_shutter", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "blurfac"); RNA_def_property_ui_range(prop, 0.01f, 2.0f, 1, 1); + RNA_def_property_float_default(prop, RENDERSETTINGS_MOTION_BLUR_SHUTTER_DEFAULT); RNA_def_property_ui_text(prop, "Shutter", "Time taken in frames between shutter open and close"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update"); @@ -3726,6 +3812,7 @@ /* border */ prop = RNA_def_property(srna, "use_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_BORDER); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_BORDER_DEFAULT); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Border", "Render a user-defined border region, within the frame size " @@ -3764,23 +3851,27 @@ prop = RNA_def_property(srna, "use_crop_to_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_CROP); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_CROP_TO_BORDER_DEFAULT); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Crop to Border", "Crop the rendered frame to the defined border size"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_placeholder", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_TOUCH); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_PLACEHOLDER_DEFAULT); RNA_def_property_ui_text(prop, "Placeholders", "Create empty placeholder files while rendering frames (similar to Unix 'touch')"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_overwrite", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", R_NO_OVERWRITE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_OVERWRITE_DEFAULT); RNA_def_property_ui_text(prop, "Overwrite", "Overwrite existing files while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_compositing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_DOCOMP); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_COMPOSITING_DEFAULT); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Compositing", "Process the render result through the compositing pipeline, " @@ -3789,6 +3880,7 @@ prop = RNA_def_property(srna, "use_sequencer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_DOSEQ); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_SEQUENCER_DEFAULT); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Sequencer", "Process the render (and composited) result through the video sequence " @@ -3797,6 +3889,7 @@ prop = RNA_def_property(srna, "use_file_extension", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXTENSION); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_FILE_EXTENSION_DEFAULT); RNA_def_property_ui_text(prop, "File Extensions", "Add the file format extensions to the rendered file name (eg: filename + .jpg)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3822,18 +3915,21 @@ prop = RNA_def_property(srna, "use_free_image_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_FREE_IMAGE_TEXTURES_DEFAULT); RNA_def_property_ui_text(prop, "Free Image Textures", "Free all image textures from memory after render, to save memory before compositing"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_free_unused_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_COMP_FREE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_FREE_UNUSED_NODES_DEFAULT); RNA_def_property_ui_text(prop, "Free Unused Nodes", "Free Nodes that are not used while compositing, to save memory"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_save_buffers", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_SAVE_BUFFERS_DEFAULT); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_save_buffers_get", NULL); RNA_def_property_ui_text(prop, "Save Buffers", "Save tiles for all RenderLayers and SceneNodes to files in the temp directory " @@ -3842,6 +3938,7 @@ prop = RNA_def_property(srna, "use_full_sample", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FULL_SAMPLE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_FULL_SAMPLE_DEFAULT); RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL); RNA_def_property_ui_text(prop, "Full Sample", "Save for every anti-aliasing sample the entire RenderLayer results " @@ -3851,6 +3948,7 @@ prop = RNA_def_property(srna, "display_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "displaymode"); RNA_def_property_enum_items(prop, display_mode_items); + RNA_def_property_enum_default(prop, RENDERSETTINGS_DISPLAY_MODE_DEFAULT); RNA_def_property_ui_text(prop, "Display", "Select where rendered images will be displayed"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3888,6 +3986,7 @@ prop = RNA_def_property(srna, "use_bake_selected_to_active", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_TO_ACTIVE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_BAKE_SELECTED_TO_ACTIVE_DEFAULT); RNA_def_property_ui_text(prop, "Selected to Active", "Bake shading on the surface of selected objects to the active object"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3901,6 +4000,7 @@ prop = RNA_def_property(srna, "use_bake_clear", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bake_flag", R_BAKE_CLEAR); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_BAKE_CLEAR_DEFAULT); RNA_def_property_ui_text(prop, "Clear", "Clear Images before baking"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3912,6 +4012,7 @@ prop = RNA_def_property(srna, "bake_margin", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "bake_filter"); RNA_def_property_range(prop, 0, 64); + RNA_def_property_int_default(prop, RENDERSETTINGS_BAKE_MARGIN_DEFAULT); RNA_def_property_ui_text(prop, "Margin", "Amount of pixels to extend the baked result with, as post process filter"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -3957,58 +4058,69 @@ prop = RNA_def_property(srna, "use_stamp_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_TIME); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_TIME_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Time", "Include the rendered frame timecode as HH:MM:SS.FF in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_date", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_DATE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_DATE_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Date", "Include the current date in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_frame", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_FRAME); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_FRAME_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Frame", "Include the frame number in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_camera", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_CAMERA); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_CAMERA_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Camera", "Include the name of the active camera in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_lens", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_CAMERALENS); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_LENS_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Lens", "Include the active camera's lens in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_scene", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_SCENE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_SCENE_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Scene", "Include the name of the active scene in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_note", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_NOTE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_NOTE_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Note", "Include a custom note in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_marker", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_MARKER); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_MARKER_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Marker", "Include the name of the last marker in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_filename", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_FILENAME); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_FILENAME_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Filename", "Include the .blend filename in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_sequencer_strip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_SEQSTRIP); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_SEQUENCER_STRIP_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Sequence Strip", "Include the name of the foreground sequence strip in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_render_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "stamp", R_STAMP_RENDERTIME); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_STAMP_RENDER_TIME_DEFAULT); RNA_def_property_ui_text(prop, "Stamp Render Time", "Include the render time in image metadata"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -4025,6 +4137,7 @@ prop = RNA_def_property(srna, "stamp_font_size", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "stamp_font_id"); RNA_def_property_range(prop, 8, 64); + RNA_def_property_int_default(prop, RENDERSETTINGS_STAMP_FONT_SIZE_DEFAULT); RNA_def_property_ui_text(prop, "Font Size", "Size of the font used when rendering stamp text"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); @@ -4118,27 +4231,32 @@ prop = RNA_def_property(srna, "simplify_subdivision", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "simplify_subsurf"); RNA_def_property_ui_range(prop, 0, 6, 1, 0); + RNA_def_property_int_default(prop, RENDERSETTINGS_SIMPLIFY_SUBDIVISION_DEFAULT); RNA_def_property_ui_text(prop, "Simplify Subdivision", "Global maximum subdivision level"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop = RNA_def_property(srna, "simplify_child_particles", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "simplify_particles"); + RNA_def_property_float_default(prop, RENDERSETTINGS_SIMPLIFY_CHILD_PARTICLES_DEFAULT); RNA_def_property_ui_text(prop, "Simplify Child Particles", "Global child particles percentage"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop = RNA_def_property(srna, "simplify_shadow_samples", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "simplify_shadowsamples"); RNA_def_property_ui_range(prop, 1, 16, 1, 0); + RNA_def_property_int_default(prop, RENDERSETTINGS_SIMPLIFY_SHADOW_SAMPLES_DEFAULT); RNA_def_property_ui_text(prop, "Simplify Shadow Samples", "Global maximum shadow samples"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop = RNA_def_property(srna, "simplify_ao_sss", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "simplify_aosss"); + RNA_def_property_float_default(prop, RENDERSETTINGS_SIMPLIFY_AO_SSS_DEFAULT); RNA_def_property_ui_text(prop, "Simplify AO and SSS", "Global approximate AO and SSS quality factor"); RNA_def_property_update(prop, 0, "rna_Scene_simplify_update"); prop = RNA_def_property(srna, "use_simplify_triangulate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "simplify_flag", R_SIMPLE_NO_TRIANGULATE); + RNA_def_property_boolean_default(prop, RENDERSETTINGS_USE_SIMPLIFY_TRIANGULATE_DEFAULT); RNA_def_property_ui_text(prop, "Skip Quad to Triangles", "Disable non-planar quads being triangulated"); /* persistent data */ @@ -4346,7 +4464,9 @@ FunctionRNA *func; PropertyRNA *parm; - + + static float default_gravity[3] = {SCENE_GRAVITY_X_DEFAULT, SCENE_GRAVITY_Y_DEFAULT, SCENE_GRAVITY_Z_DEFAULT}; + static EnumPropertyItem audio_distance_model_items[] = { {0, "NONE", 0, "None", "No distance attenuation"}, {1, "INVERSE", 0, "Inverse", "Inverse distance model"}, @@ -4450,6 +4570,7 @@ RNA_def_property_int_sdna(prop, NULL, "r.sfra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_start_frame_set", NULL); RNA_def_property_range(prop, MINFRAME, MAXFRAME); + RNA_def_property_int_default(prop, SCENE_FRAME_START_DEFAULT); RNA_def_property_ui_text(prop, "Start Frame", "First frame of the playback/rendering range"); RNA_def_property_update(prop, NC_SCENE | ND_FRAME_RANGE, NULL); @@ -4458,6 +4579,7 @@ RNA_def_property_int_sdna(prop, NULL, "r.efra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_end_frame_set", NULL); RNA_def_property_range(prop, MINFRAME, MAXFRAME); + RNA_def_property_int_default(prop, SCENE_FRAME_END_DEFAULT); RNA_def_property_ui_text(prop, "End Frame", "Final frame of the playback/rendering range"); RNA_def_property_update(prop, NC_SCENE | ND_FRAME_RANGE, NULL); @@ -4466,6 +4588,7 @@ RNA_def_property_int_sdna(prop, NULL, "r.frame_step"); RNA_def_property_range(prop, 0, MAXFRAME); RNA_def_property_ui_range(prop, 1, 100, 1, 0); + RNA_def_property_int_default(prop, SCENE_FRAME_STEP_DEFAULT); RNA_def_property_ui_text(prop, "Frame Step", "Number of frames to skip forward while rendering/playing back each frame"); RNA_def_property_update(prop, NC_SCENE | ND_FRAME, NULL); @@ -4594,6 +4717,7 @@ RNA_def_property_float_sdna(prop, NULL, "physics_settings.gravity"); RNA_def_property_array(prop, 3); RNA_def_property_range(prop, -200.0f, 200.0f); + RNA_def_property_float_array_default(prop, default_gravity); RNA_def_property_ui_text(prop, "Gravity", "Constant acceleration in a given direction"); RNA_def_property_update(prop, 0, "rna_Physics_update"); @@ -4637,6 +4761,7 @@ RNA_def_property_float_sdna(prop, NULL, "audio.speed_of_sound"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.01f, FLT_MAX); + RNA_def_property_float_default(prop, SCENE_AUDIO_DOPPLER_SPEED_DEFAULT); RNA_def_property_ui_text(prop, "Speed of Sound", "Speed of sound for Doppler effect calculation"); RNA_def_property_update(prop, NC_SCENE, "rna_Scene_listener_update"); @@ -4644,6 +4769,7 @@ RNA_def_property_float_sdna(prop, NULL, "audio.doppler_factor"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.0, FLT_MAX); + RNA_def_property_float_default(prop, SCENE_AUDIO_DOPPLER_FACTOR_DEFAULT); RNA_def_property_ui_text(prop, "Doppler Factor", "Pitch factor for Doppler effect calculation"); RNA_def_property_update(prop, NC_SCENE, "rna_Scene_listener_update"); @@ -4651,12 +4777,14 @@ RNA_def_property_enum_bitflag_sdna(prop, NULL, "audio.distance_model"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_enum_items(prop, audio_distance_model_items); + RNA_def_property_enum_default(prop, SCENE_AUDIO_DISTANCE_MODEL_DEFAULT); RNA_def_property_ui_text(prop, "Distance Model", "Distance model for distance attenuation calculation"); RNA_def_property_update(prop, NC_SCENE, "rna_Scene_listener_update"); prop = RNA_def_property(srna, "audio_volume", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "audio.volume"); RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_float_default(prop, SCENE_AUDIO_VOLUME_DEFAULT); RNA_def_property_ui_text(prop, "Volume", "Audio volume"); RNA_def_property_translation_context(prop, BLF_I18NCONTEXT_ID_SOUND); RNA_def_property_update(prop, NC_SCENE, NULL);