Commit: ee788360ccb6bf9329928610bf27430fa839873c
Author: Nick Wu
Date: Wed Jul 11 15:03:52 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBee788360ccb6bf9329928610bf27430fa839873c
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_scene_types.h
index 971cc930245,e6ad7835b24..d98159b1c5e
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1428,72 -1431,11 +1431,75 @@@ typedef struct SceneEEVEE
int shadow_method;
int shadow_cube_size;
int shadow_cascade_size;
+
+ struct LightCache *light_cache;
+ char light_cache_info[64];
} 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;
+ int size;
+
+ /* 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 InitComplete;
+ 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 calculate_intersections;
+ int _size;
+
+} SceneLANPR;
+
/* *************************************************************** */
/* Scene ID-Block */
diff --cc source/blender/makesrna/intern/rna_internal.h
index db68d5337fc,a57777f0630..092c528c390
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@@ -155,10 -155,9 +155,10 @@@ void RNA_def_fcurve(struct BlenderRNA *
void RNA_def_gpencil(struct BlenderRNA *brna);
void RNA_def_image(struct BlenderRNA *brna);
void RNA_def_key(struct BlenderRNA *brna);
- void RNA_def_lamp(struct BlenderRNA *brna);
+ void RNA_def_light(struct BlenderRNA *brna);
void RNA_def_lattice(struct BlenderRNA *brna);
void RNA_def_linestyle(struct BlenderRNA *brna);
+void RNA_def_lanpr(struct BlenderRNA *brna);
void RNA_def_main(struct BlenderRNA *brna);
void RNA_def_material(struct BlenderRNA *brna);
void RNA_def_mesh(struct BlenderRNA *brna);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
