[Bf-blender-cvs] [a89bcac14b0] hair_guides_grooming: Merge branch 'hair_guides' into hair_guides_grooming
Lukas Toenne
noreply at git.blender.org
Sun Jul 15 14:08:50 CEST 2018
Commit: a89bcac14b083ef723d8d4a464ca75942743ec89
Author: Lukas Toenne
Date: Sun Jul 15 12:18:38 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBa89bcac14b083ef723d8d4a464ca75942743ec89
Merge branch 'hair_guides' into hair_guides_grooming
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/__init__.py
index 0f6880d9332,b63ccabfdb6..658b97d2992
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@@ -34,8 -34,7 +34,8 @@@ _modules =
"properties_data_camera",
"properties_data_curve",
"properties_data_empty",
+ "properties_data_groom",
- "properties_data_lamp",
+ "properties_data_light",
"properties_data_lattice",
"properties_data_mesh",
"properties_data_metaball",
diff --cc source/blender/blenkernel/intern/object.c
index 456f20a88a1,14794bd7061..a07e81e22b0
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -672,9 -647,8 +661,9 @@@ static const char *get_obdata_defname(i
case OB_SURF: return DATA_("Surf");
case OB_FONT: return DATA_("Text");
case OB_MBALL: return DATA_("Mball");
+ case OB_GROOM: return DATA_("Groom");
case OB_CAMERA: return DATA_("Camera");
- case OB_LAMP: return DATA_("Lamp");
+ case OB_LAMP: return DATA_("Light");
case OB_LATTICE: return DATA_("Lattice");
case OB_ARMATURE: return DATA_("Armature");
case OB_SPEAKER: return DATA_("Speaker");
diff --cc source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 10af3fef5b6,20aec0ba5ed..10df9ed05a4
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@@ -923,12 -933,12 +945,18 @@@ void discard_mesh_edit_mode_pointers(I
mesh_cow->edit_btmesh = NULL;
}
+void discard_groom_edit_mode_pointers(ID *id_cow)
+{
+ Groom *groom_cow = (Groom *)id_cow;
+ groom_cow->editgroom = NULL;
+}
+
+ void discard_scene_pointers(ID *id_cow)
+ {
+ Scene *scene_cow = (Scene *)id_cow;
+ scene_cow->eevee.light_cache = NULL;
+ }
+
/* NULL-ify all edit mode pointers which points to data from
* original object.
*/
diff --cc source/blender/draw/modes/object_mode.c
index a4ac2dc6d28,bbd7c658384..ea36b03284b
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@@ -2243,26 -2277,10 +2279,29 @@@ static void OBJECT_cache_populate(void
}
break;
}
+ case OB_GROOM:
+ {
+ if (ob != draw_ctx->object_edit) {
+ Groom *groom = ob->data;
+ {
+ struct Gwn_Batch *geom = DRW_cache_groom_wire_get(ob);
+ if (theme_id == TH_UNDEFINED) {
+ theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
+ }
+ DRWShadingGroup *shgroup = shgroup_theme_id_to_wire_or(stl, theme_id, stl->g_data->wire);
+ DRW_shgroup_call_add(shgroup, geom, ob->obmat);
+ }
+
+ Mesh *scalp = BKE_groom_get_scalp(draw_ctx->depsgraph, groom);
+ DRW_shgroup_hair(ob, groom->hair_system, groom->hair_draw_settings, scalp,
+ stl->g_data->hair_verts, stl->g_data->hair_edges);
+ }
+ break;
+ }
case OB_LAMP:
+ if (hide_object_extra) {
+ break;
+ }
DRW_shgroup_lamp(stl, ob, view_layer);
break;
case OB_CAMERA:
diff --cc source/blender/editors/object/object_ops.c
index b48d4437df9,192df257bba..c3ecedaba97
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -114,10 -114,9 +114,10 @@@ void ED_operatortypes_object(void
WM_operatortype_append(OBJECT_OT_empty_add);
WM_operatortype_append(OBJECT_OT_lightprobe_add);
WM_operatortype_append(OBJECT_OT_drop_named_image);
- WM_operatortype_append(OBJECT_OT_lamp_add);
+ WM_operatortype_append(OBJECT_OT_light_add);
WM_operatortype_append(OBJECT_OT_camera_add);
WM_operatortype_append(OBJECT_OT_speaker_add);
+ WM_operatortype_append(OBJECT_OT_groom_add);
WM_operatortype_append(OBJECT_OT_add);
WM_operatortype_append(OBJECT_OT_add_named);
WM_operatortype_append(OBJECT_OT_effector_add);
diff --cc source/blender/editors/space_buttons/buttons_context.c
index c7652403263,faee9c2b7ac..7b360fb664d
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -226,10 -234,9 +234,10 @@@ static int buttons_context_path_data(Bu
else if (RNA_struct_is_a(ptr->type, &RNA_MetaBall) && (type == -1 || type == OB_MBALL)) return 1;
else if (RNA_struct_is_a(ptr->type, &RNA_Lattice) && (type == -1 || type == OB_LATTICE)) return 1;
else if (RNA_struct_is_a(ptr->type, &RNA_Camera) && (type == -1 || type == OB_CAMERA)) return 1;
- else if (RNA_struct_is_a(ptr->type, &RNA_Lamp) && (type == -1 || type == OB_LAMP)) return 1;
+ else if (RNA_struct_is_a(ptr->type, &RNA_Light) && (type == -1 || type == OB_LAMP)) return 1;
else if (RNA_struct_is_a(ptr->type, &RNA_Speaker) && (type == -1 || type == OB_SPEAKER)) return 1;
else if (RNA_struct_is_a(ptr->type, &RNA_LightProbe) && (type == -1 || type == OB_LIGHTPROBE)) return 1;
+ else if (RNA_struct_is_a(ptr->type, &RNA_Groom) && (type == -1 || type == OB_GROOM)) return 1;
/* try to get an object in the path, no pinning supported here */
else if (buttons_context_path_object(path)) {
ob = path->ptr[path->len - 1].data;
diff --cc source/blender/editors/transform/transform.h
index 55ade974057,2006bd830b4..a74a0dc7a11
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@@ -708,12 -708,11 +708,12 @@@ void flushTransSeq(TransInfo *t)
void flushTransTracking(TransInfo *t);
void flushTransMasking(TransInfo *t);
void flushTransPaintCurve(TransInfo *t);
+void flushTransGroom(TransInfo *t);
void restoreBones(TransDataContainer *tc);
- /*********************** transform_manipulator.c ********** */
+ /*********************** transform_gizmo.c ********** */
- #define MANIPULATOR_AXIS_LINE_WIDTH 2.0f
+ #define GIZMO_AXIS_LINE_WIDTH 2.0f
/* return 0 when no gimbal for selection */
bool gimbal_axis(struct Object *ob, float gmat[3][3]);
diff --cc source/blender/makesrna/intern/rna_ID.c
index a7338e6e91a,0a294bfaab9..fe1b6189978
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -225,10 -225,9 +225,10 @@@ StructRNA *ID_code_to_RNA_type(short id
case ID_CU: return &RNA_Curve;
case ID_GD: return &RNA_GreasePencil;
case ID_GR: return &RNA_Collection;
+ case ID_GM: return &RNA_Groom;
case ID_IM: return &RNA_Image;
case ID_KE: return &RNA_Key;
- case ID_LA: return &RNA_Lamp;
+ case ID_LA: return &RNA_Light;
case ID_LI: return &RNA_Library;
case ID_LS: return &RNA_FreestyleLineStyle;
case ID_LT: return &RNA_Lattice;
diff --cc source/blender/makesrna/intern/rna_internal.h
index a1cb1984785,f9c1e497716..b2fb2e8ff46
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@@ -153,10 -153,9 +153,10 @@@ void RNA_def_dynamic_paint(struct Blend
void RNA_def_fluidsim(struct BlenderRNA *brna);
void RNA_def_fcurve(struct BlenderRNA *brna);
void RNA_def_gpencil(struct BlenderRNA *brna);
+void RNA_def_groom(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_main(struct BlenderRNA *brna);
diff --cc source/blender/makesrna/intern/rna_object.c
index 7cf79102f75,2bdfbade53a..71e661bf9fe
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -146,10 -146,9 +146,10 @@@ const EnumPropertyItem rna_enum_object_
{OB_EMPTY, "EMPTY", 0, "Empty", ""},
{0, "", 0, NULL, NULL},
{OB_CAMERA, "CAMERA", 0, "Camera", ""},
- {OB_LAMP, "LAMP", 0, "Lamp", ""},
+ {OB_LAMP, "LIGHT", 0, "Light", ""},
{OB_SPEAKER, "SPEAKER", 0, "Speaker", ""},
{OB_LIGHTPROBE, "LIGHT_PROBE", 0, "Probe", ""},
+ {OB_GROOM, "GROOM", 0, "Groom", ""},
{0, NULL, 0, NULL, NULL}
};
diff --cc source/blender/windowmanager/WM_types.h
index dc461e77d9e,a5536dbd652..fc62ba51342
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@@ -257,7 -257,7 +257,8 @@@ typedef struct wmNotifier
#define NC_GPENCIL (22<<24)
#define NC_LINESTYLE (23<<24)
#define NC_CAMERA (24<<24)
- #define NC_GROOM (25<<24)
-#define NC_LIGHTPROBE (25<<24)
++#define NC_LIGHTPROBE (25<<24)
++#define NC_GROOM (26<<24)
/* data type, 256 entries is enough, it can overlap */
#define NOTE_DATA 0x00FF0000
More information about the Bf-blender-cvs
mailing list