[Bf-blender-cvs] [01a37d8] wiggly-widgets: Fix incorrect wrapping of lamp to RNA for widget.
Antony Riakiotakis
noreply at git.blender.org
Wed Nov 12 14:38:00 CET 2014
Commit: 01a37d8b03570f31a563bbbc4ea3d9068cbb71cd
Author: Antony Riakiotakis
Date: Wed Nov 12 14:37:50 2014 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB01a37d8b03570f31a563bbbc4ea3d9068cbb71cd
Fix incorrect wrapping of lamp to RNA for widget.
===================================================================
M source/blender/editors/object/object_lamp.c
===================================================================
diff --git a/source/blender/editors/object/object_lamp.c b/source/blender/editors/object/object_lamp.c
index 162920c..87999d5 100644
--- a/source/blender/editors/object/object_lamp.c
+++ b/source/blender/editors/object/object_lamp.c
@@ -217,15 +217,16 @@ bool WIDGETGROUP_lamp_poll(struct wmWidgetGroup *UNUSED(wgroup), const struct bC
void WIDGETGROUP_lamp_update(struct wmWidgetGroup *wgroup, const struct bContext *C)
{
Object *ob = CTX_data_active_object(C);
- wmWidget *lamp = WM_widgetgroup_widgets(wgroup)->first;
+ Lamp *la = ob->data;
+ wmWidget *widget = WM_widgetgroup_widgets(wgroup)->first;
WidgetGroupLamp *data = WM_widgetgroup_customdata(wgroup);
float dir[3];
- RNA_pointer_create(&ob->id, &RNA_Lamp, ob->data, data->lamp);
- WM_widget_set_origin(lamp, ob->obmat[3]);
- WM_widget_property(lamp, data->lamp, "spot_size");
+ RNA_pointer_create(&la->id, &RNA_Lamp, la, data->lamp);
+ WM_widget_set_origin(widget, ob->obmat[3]);
+ WM_widget_property(widget, data->lamp, "spot_size");
negate_v3_v3(dir, ob->obmat[2]);
- WIDGET_arrow_set_direction(lamp, dir);
+ WIDGET_arrow_set_direction(widget, dir);
}
More information about the Bf-blender-cvs
mailing list