Differential D8115 Diff 26459 source/blender/modifiers/intern/MOD_wave.c

Changeset View

Standalone View

source/blender/modifiers/intern/MOD_wave.c

Show First 20 Lines • Show All 443 Lines • ▼ Show 20 Lines	static void time_panel_draw(const bContext C, Panel panel)
uiItemR(col, &ptr, "time_offset", 0, "Offset", ICON_NONE);		uiItemR(col, &ptr, "time_offset", 0, "Offset", ICON_NONE);
uiItemR(col, &ptr, "lifetime", 0, "Life", ICON_NONE);		uiItemR(col, &ptr, "lifetime", 0, "Life", ICON_NONE);
uiItemR(col, &ptr, "damping_time", 0, "Damping", ICON_NONE);		uiItemR(col, &ptr, "damping_time", 0, "Damping", ICON_NONE);
uiItemR(col, &ptr, "speed", UI_ITEM_R_SLIDER, NULL, ICON_NONE);		uiItemR(col, &ptr, "speed", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
}		}

static void texture_panel_draw(const bContext C, Panel panel)		static void texture_panel_draw(const bContext C, Panel panel)
{		{
		uiLayout *col;
uiLayout *layout = panel->layout;		uiLayout *layout = panel->layout;

PointerRNA ptr;		PointerRNA ptr;
PointerRNA ob_ptr;		PointerRNA ob_ptr;
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);		modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);

int texture_coords = RNA_enum_get(&ptr, "texture_coords");		int texture_coords = RNA_enum_get(&ptr, "texture_coords");

uiTemplateID(layout, C, &ptr, "texture", "texture.new", NULL, NULL, 0, ICON_NONE, NULL);		uiTemplateID(layout, C, &ptr, "texture", "texture.new", NULL, NULL, 0, ICON_NONE, NULL);

uiLayoutSetPropSep(layout, true);		uiLayoutSetPropSep(layout, true);

uiItemR(layout, &ptr, "texture_coords", 0, IFACE_("Coordinates"), ICON_NONE);		col = uiLayoutColumn(layout, false);
		uiItemR(col, &ptr, "texture_coords", 0, IFACE_("Coordinates"), ICON_NONE);
if (texture_coords == MOD_DISP_MAP_OBJECT) {		if (texture_coords == MOD_DISP_MAP_OBJECT) {
uiItemR(layout, &ptr, "texture_coords_object", 0, NULL, ICON_NONE);		uiItemR(col, &ptr, "texture_coords_object", 0, IFACE_("Object"), ICON_NONE);
PointerRNA texture_coords_obj_ptr = RNA_pointer_get(&ptr, "texture_coords_object");		PointerRNA texture_coords_obj_ptr = RNA_pointer_get(&ptr, "texture_coords_object");
if (!RNA_pointer_is_null(&texture_coords_obj_ptr) &&		if (!RNA_pointer_is_null(&texture_coords_obj_ptr) &&
(RNA_enum_get(&texture_coords_obj_ptr, "type") == OB_ARMATURE)) {		(RNA_enum_get(&texture_coords_obj_ptr, "type") == OB_ARMATURE)) {
PointerRNA texture_coords_obj_data_ptr = RNA_pointer_get(&texture_coords_obj_ptr, "data");		PointerRNA texture_coords_obj_data_ptr = RNA_pointer_get(&texture_coords_obj_ptr, "data");
uiItemPointerR(layout,		uiItemPointerR(col,
&ptr,		&ptr,
"texture_coords_bone",		"texture_coords_bone",
&texture_coords_obj_data_ptr,		&texture_coords_obj_data_ptr,
"bones",		"bones",
IFACE_("Bone"),		IFACE_("Bone"),
ICON_NONE);		ICON_NONE);
}		}
}		}
else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) {		else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) {
PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data");		PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data");
uiItemPointerR(layout, &ptr, "uv_layer", &obj_data_ptr, "uv_layers", NULL, ICON_NONE);		uiItemPointerR(col, &ptr, "uv_layer", &obj_data_ptr, "uv_layers", NULL, ICON_NONE);
}		}
}		}

static void panelRegister(ARegionType *region_type)		static void panelRegister(ARegionType *region_type)
{		{
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Wave, panel_draw);		PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Wave, panel_draw);
modifier_subpanel_register(		modifier_subpanel_register(
region_type, "position", "Start Position", NULL, position_panel_draw, panel_type);		region_type, "position", "Start Position", NULL, position_panel_draw, panel_type);
Show All 39 Lines