[Bf-blender-cvs] [3c7da86849f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Nick Wu
noreply at git.blender.org
Mon Nov 26 13:28:15 CET 2018
Commit: 3c7da86849fecfe099b07b9f9a9869cb57111b3f
Author: Nick Wu
Date: Mon Nov 19 12:51:52 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB3c7da86849fecfe099b07b9f9a9869cb57111b3f
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/makesdna/DNA_lamp_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_lamp_types.h
index c40ffea0015,d035e0c5440..5a551f602a2
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@@ -98,21 -98,21 +98,21 @@@ typedef struct Lamp
/* **************** LAMP ********************* */
/* flag */
-#define LA_DS_EXPAND 1
- /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
- * otherwise anim-editors will not read correctly
- */
-#define LA_DS_SHOW_TEXS 4
+#define LA_DS_EXPAND 1
+/* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
+ * otherwise anim-editors will not read correctly
+ */
+#define LA_DS_SHOW_TEXS 4
/* type */
-#define LA_LOCAL 0
-#define LA_SUN 1
-#define LA_SPOT 2
+#define LA_LOCAL 0
+#define LA_SUN 1
+#define LA_SPOT 2
- #define LA_HEMI 3
+ /* #define LA_HEMI 3 */ /* not used anymore */
-#define LA_AREA 4
+#define LA_AREA 4
/* mode */
-#define LA_SHADOW (1 << 0)
+#define LA_SHADOW (1 << 0)
/* #define LA_HALO (1 << 1) */ /* not used anymore */
/* #define LA_LAYER (1 << 2) */ /* not used anymore */
/* #define LA_QUAD (1 << 3) */ /* not used anymore */
@@@ -134,21 -134,22 +134,22 @@@
#define LA_SHOW_CONE (1 << 17)
/* #define LA_SHOW_SHADOW_BOX (1 << 18) */
#define LA_SHAD_CONTACT (1 << 19)
+ #define LA_CUSTOM_ATTENUATION (1 << 20)
/* falloff_type */
-#define LA_FALLOFF_CONSTANT 0
-#define LA_FALLOFF_INVLINEAR 1
-#define LA_FALLOFF_INVSQUARE 2
-#define LA_FALLOFF_CURVE 3
-#define LA_FALLOFF_SLIDERS 4
-#define LA_FALLOFF_INVCOEFFICIENTS 5
+#define LA_FALLOFF_CONSTANT 0
+#define LA_FALLOFF_INVLINEAR 1
+#define LA_FALLOFF_INVSQUARE 2
+#define LA_FALLOFF_CURVE 3
+#define LA_FALLOFF_SLIDERS 4
+#define LA_FALLOFF_INVCOEFFICIENTS 5
/* area shape */
-#define LA_AREA_SQUARE 0
-#define LA_AREA_RECT 1
-#define LA_AREA_CUBE 2
-#define LA_AREA_BOX 3
-#define LA_AREA_DISK 4
-#define LA_AREA_ELLIPSE 5
+#define LA_AREA_SQUARE 0
+#define LA_AREA_RECT 1
+#define LA_AREA_CUBE 2
+#define LA_AREA_BOX 3
+#define LA_AREA_DISK 4
+#define LA_AREA_ELLIPSE 5
#endif /* __DNA_LAMP_TYPES_H__ */
diff --cc source/blender/makesdna/DNA_scene_types.h
index dcd23819f53,c1ced30169b..900567e5c9b
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1508,71 -1508,9 +1508,71 @@@ typedef struct SceneEEVEE
char light_cache_info[64];
float overscan;
- float pad;
+ float light_threshold;
} SceneEEVEE;
+
+/* LANPR Global Config */
+
+struct LANPR_RenderBuffer;
+struct LANPR_LineLayer;
+
+typedef struct SceneLANPR {
+
+ int master_mode;
+
+ int enable_vector_trace;
+ int display_thinning_result;
+
+ //int SizeCompensate;
+
+ float depth_clamp;
+ float depth_strength;
+ float normal_clamp;
+ float normal_strength;
+
+ float line_thickness;
+
+ int use_same_taper;
+ float taper_left_distance;
+ float taper_left_strength;
+ float taper_right_distance;
+ float taper_right_strength;
+
+ int enable_tip_extend;
+ float extend_length;
+
+ int snake_sensitivity;
+
+ /* shared */
+
+ float contour_fade; /* for dpix contour fading,reserved for future usage */
+ float crease_threshold; /* 0-1 range for cosine angle */
+ float crease_fade_threshold; /* for dpix crease fading */
+
+ float line_color[4];
+ float background_color[4];
+
+ float depth_width_influence;
+ float depth_width_curve;
+ float depth_alpha_influence;
+ float depth_alpha_curve;
+
+ /* states (needs optimization) */
+
+ int reloaded;
+
+ /* offline render */
+
+ struct LANPR_RenderBuffer *render_buffer; /* created when needed. for offline rendering */
+ ListBase line_layers; /* now here!!! */
+ struct LANPR_LineLayer *active_layer;
+
+ int enable_intersections;
+ int enable_chaining;
+
+} SceneLANPR;
+
/* *************************************************************** */
/* Scene ID-Block */
diff --cc source/blender/makesrna/intern/rna_scene.c
index 7b64247a1da,4791fbdc642..706b265a482
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -5737,9 -5679,29 +5737,29 @@@ static void rna_def_scene_eevee(Blender
RNA_def_property_enum_items(prop, eevee_gi_visibility_size_items);
RNA_def_property_enum_default(prop, 32);
RNA_def_property_ui_text(prop, "Irradiance Visibility Size",
- "Size of the shadow map applied to each irradiance sample");
+ "Size of the shadow map applied to each irradiance sample");
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+ prop = RNA_def_property(srna, "gi_irradiance_smoothing", PROP_FLOAT, PROP_FACTOR);
+ RNA_def_property_range(prop, 0.0f, FLT_MAX);
+ RNA_def_property_ui_range(prop, 0.0f, 1.0f, 5, 2);
+ RNA_def_property_float_default(prop, 0.1f);
+ RNA_def_property_ui_text(prop, "Irradiance Smoothing", "Smoother irradiance interpolation but introduce light bleeding");
+ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+
+ prop = RNA_def_property(srna, "gi_glossy_clamp", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_default(prop, 0.0f);
+ RNA_def_property_ui_text(prop, "Clamp Glossy", "Clamp pixel intensity to reduce noise inside glossy reflections "
+ "from reflection cubemaps (0 to disabled)");
+ RNA_def_property_range(prop, 0.0f, FLT_MAX);
+ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+
+ prop = RNA_def_property(srna, "gi_filter_quality", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_default(prop, 1.0f);
+ RNA_def_property_ui_text(prop, "Filter Quality", "Take more samples during cubemap filtering to remove artifacts");
+ RNA_def_property_range(prop, 1.0f, 8.0f);
+ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+
prop = RNA_def_property(srna, "gi_show_irradiance", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_SHOW_IRRADIANCE);
RNA_def_property_boolean_default(prop, 0);
More information about the Bf-blender-cvs
mailing list