[Bf-blender-cvs] [8a8b9d7ea9c] hair_guides tmp_hair_curves: Merge branch 'blender2.8' into hair_guides
Lukas Toenne
noreply at git.blender.org
Tue Jul 10 09:03:07 CEST 2018
Commit: 8a8b9d7ea9cbeace660699927790eee5a01cb438
Author: Lukas Toenne
Date: Tue Jul 10 07:34:05 2018 +0100
Branches: hair_guides tmp_hair_curves
https://developer.blender.org/rB8a8b9d7ea9cbeace660699927790eee5a01cb438
Merge branch 'blender2.8' into hair_guides
===================================================================
===================================================================
diff --cc source/blender/blenkernel/CMakeLists.txt
index f2da765d18f,0578a3ecc69..f532ad9bae3
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -280,7 -276,7 +280,8 @@@ set(SR
BKE_mesh_iterators.h
BKE_mesh_mapping.h
BKE_mesh_remap.h
+ BKE_mesh_runtime.h
+ BKE_mesh_sample.h
BKE_mesh_tangent.h
BKE_modifier.h
BKE_movieclip.h
diff --cc source/blender/draw/engines/workbench/workbench_private.h
index 23c550d6999,a8fa1beb3b7..e219bb31923
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@@ -39,9 -39,9 +39,9 @@@
#define WORKBENCH_ENGINE "BLENDER_WORKBENCH"
#define M_GOLDEN_RATION_CONJUGATE 0.618033988749895
-#define MAX_SHADERS (1 << 10)
+#define MAX_SHADERS (1 << 11)
- #define TEXTURE_DRAWING_ENABLED(wpd) (wpd->color_type & V3D_SHADING_TEXTURE_COLOR)
+ #define TEXTURE_DRAWING_ENABLED(wpd) (wpd->shading.color_type & V3D_SHADING_TEXTURE_COLOR)
#define FLAT_ENABLED(wpd) (wpd->shading.light == V3D_LIGHTING_FLAT)
#define STUDIOLIGHT_ENABLED(wpd) (wpd->shading.light == V3D_LIGHTING_STUDIO)
#define MATCAP_ENABLED(wpd) (wpd->shading.light == V3D_LIGHTING_MATCAP)
diff --cc source/blender/makesrna/RNA_access.h
index e0fee3848aa,fe8868235c4..44320e6a9c6
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -280,11 -280,8 +280,11 @@@ extern StructRNA RNA_GPencilSculptBrush
extern StructRNA RNA_GaussianBlurSequence;
extern StructRNA RNA_GlowSequence;
extern StructRNA RNA_GreasePencil;
+extern StructRNA RNA_HairGroup;
+extern StructRNA RNA_HairModifier;
+extern StructRNA RNA_HairPattern;
extern StructRNA RNA_Header;
- extern StructRNA RNA_HemiLamp;
+ extern StructRNA RNA_HemiLight;
extern StructRNA RNA_Histogram;
extern StructRNA RNA_HookModifier;
extern StructRNA RNA_ID;
diff --cc source/blender/makesrna/intern/makesrna.c
index b3334670857,4b06d917ab7..ce31d84e009
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@@ -3405,10 -3405,9 +3405,10 @@@ static RNAProcessItem PROCESS_ITEMS[]
{"rna_fluidsim.c", NULL, RNA_def_fluidsim},
{"rna_gpencil.c", NULL, RNA_def_gpencil},
{"rna_group.c", NULL, RNA_def_collections},
+ {"rna_hair.c", NULL, RNA_def_hair},
{"rna_image.c", "rna_image_api.c", RNA_def_image},
{"rna_key.c", NULL, RNA_def_key},
- {"rna_lamp.c", NULL, RNA_def_lamp},
+ {"rna_lamp.c", NULL, RNA_def_light},
{"rna_lattice.c", "rna_lattice_api.c", RNA_def_lattice},
{"rna_layer.c", NULL, RNA_def_view_layer},
{"rna_linestyle.c", NULL, RNA_def_linestyle},
More information about the Bf-blender-cvs
mailing list