[Bf-blender-cvs] [df0a0a9] soc-2013-paint: Merge branch 'master' into soc-2013-paint
Antony Riakiotakis
noreply at git.blender.org
Fri Mar 14 18:43:55 CET 2014
Commit: df0a0a9639ea59ebf9bcaf25672ddc2008d688a4
Author: Antony Riakiotakis
Date: Fri Mar 14 19:27:10 2014 +0200
https://developer.blender.org/rBdf0a0a9639ea59ebf9bcaf25672ddc2008d688a4
Merge branch 'master' into soc-2013-paint
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_ui_api.c
index 705927e,7f9b5eb..ad5ed4f
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@@ -733,13 -733,8 +733,13 @@@ void RNA_api_ui_layout(StructRNA *srna
RNA_def_boolean(func, "value_slider", false, "", "Display the value slider to the right of the color wheel");
RNA_def_boolean(func, "lock", false, "", "Lock the color wheel display to value 1.0 regardless of actual color");
RNA_def_boolean(func, "lock_luminosity", false, "", "Keep the color at its original vector length");
- RNA_def_boolean(func, "cubic", true, "", "Cubic saturation for picking values close to white");
+ RNA_def_boolean(func, "cubic", false, "", "Cubic saturation for picking values close to white");
+ func = RNA_def_function(srna, "template_palette", "uiTemplatePalette");
+ RNA_def_function_ui_description(func, "Item. A palette used to pick colors");
+ api_ui_item_rna_common(func);
+ RNA_def_boolean(func, "color", 0, "", "Display the colors as colors or values");
+
func = RNA_def_function(srna, "template_image_layers", "uiTemplateImageLayers");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
parm = RNA_def_pointer(func, "image", "Image", "", "");
More information about the Bf-blender-cvs
mailing list