Revision: 42150
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42150
Author: kjym3
Date: 2011-11-25 01:09:57 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Fix for functionality inconsistency in the creation of a new line style.
Now the '+' button to the right of a line style name (in the template_ID
GUI widget) creates a copy of the active line style instead of a new
line style with default settings.
Also added a proper tool tip for the use of template_ID for line styles.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
Modified:
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
2011-11-24 23:27:20 UTC (rev 42149)
+++
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
2011-11-25 01:09:57 UTC (rev 42150)
@@ -331,6 +331,7 @@
case ID_BR: return N_("Browse Brush to be linked");
case ID_PA: return N_("Browse Particle System to be
linked");
case ID_GD: return N_("Browse Grease Pencil Data to be
linked");
+ case ID_LS: return N_("Browse Line Style Data to be
linked");
}
}
return N_("Browse ID data to be linked");
Modified:
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
2011-11-24 23:27:20 UTC (rev 42149)
+++ branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
2011-11-25 01:09:57 UTC (rev 42150)
@@ -833,7 +833,7 @@
return OPERATOR_CANCELLED;
}
lineset->linestyle->id.us--;
- lineset->linestyle = FRS_new_linestyle("LineStyle", NULL);
+ lineset->linestyle = FRS_copy_linestyle(lineset->linestyle);
WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
