[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53420] trunk/blender: add templates menu for OSL, use preprocessor directive color for decorators in python.
Campbell Barton
ideasman42 at gmail.com
Sun Dec 30 02:40:02 CET 2012
Revision: 53420
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53420
Author: campbellbarton
Date: 2012-12-30 01:39:55 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
add templates menu for OSL, use preprocessor directive color for decorators in python.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_text.py
trunk/blender/source/blender/editors/space_text/text_format_py.c
Added Paths:
-----------
trunk/blender/release/scripts/templates_osl/
trunk/blender/release/scripts/templates_py/
Removed Paths:
-------------
trunk/blender/release/scripts/templates/
Modified: trunk/blender/release/scripts/startup/bl_ui/space_text.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_text.py 2012-12-30 01:26:31 UTC (rev 53419)
+++ trunk/blender/release/scripts/startup/bl_ui/space_text.py 2012-12-30 01:39:55 UTC (rev 53420)
@@ -194,16 +194,35 @@
layout.operator("text.run_script")
-class TEXT_MT_templates(Menu):
- bl_label = "Templates"
+class TEXT_MT_templates_py(Menu):
+ bl_label = "Python"
def draw(self, context):
- self.path_menu(bpy.utils.script_paths("templates"),
+ self.path_menu(bpy.utils.script_paths("templates_py"),
"text.open",
{"internal": True},
)
+class TEXT_MT_templates_osl(Menu):
+ bl_label = "Open Shading Language"
+
+ def draw(self, context):
+ self.path_menu(bpy.utils.script_paths("templates_osl"),
+ "text.open",
+ {"internal": True},
+ )
+
+
+class TEXT_MT_templates(Menu):
+ bl_label = "Templates"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.menu("TEXT_MT_templates_py")
+ layout.menu("TEXT_MT_templates_osl")
+
+
class TEXT_MT_edit_select(Menu):
bl_label = "Select"
Modified: trunk/blender/source/blender/editors/space_text/text_format_py.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_py.c 2012-12-30 01:26:31 UTC (rev 53419)
+++ trunk/blender/source/blender/editors/space_text/text_format_py.c 2012-12-30 01:39:55 UTC (rev 53420)
@@ -271,7 +271,7 @@
/* Special vars(v) or built-in keywords(b) */
if ((i = txtfmt_py_find_specialvar(str)) != -1) prev = FMT_TYPE_SPECIAL;
else if ((i = txtfmt_py_find_builtinfunc(str)) != -1) prev = FMT_TYPE_KEYWORD;
- else if ((i = txtfmt_py_find_decorator(str)) != -1) prev = FMT_TYPE_SPECIAL; /* could have a new color for this */
+ else if ((i = txtfmt_py_find_decorator(str)) != -1) prev = FMT_TYPE_DIRECTIVE;
if (i > 0) {
memset(fmt, prev, i);
More information about the Bf-blender-cvs
mailing list