[Bf-blender-cvs] [f827ab1d0c0] blender2.8: Correct bad merge
Campbell Barton
noreply at git.blender.org
Thu Jun 28 11:29:51 CEST 2018
Commit: f827ab1d0c04bbd7328e96d762a1031948010be1
Author: Campbell Barton
Date: Thu Jun 28 11:29:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf827ab1d0c04bbd7328e96d762a1031948010be1
Correct bad merge
===================================================================
M release/scripts/startup/bl_ui/space_text.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index 37ea88dd546..aa6f8ce3b00 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -74,7 +74,7 @@ class TEXT_HT_header(Header):
if text.library
else "Text: Internal"
)
- if osl:
+ if is_osl:
row = layout.row()
row.operator("node.shader_script_update")
else:
More information about the Bf-blender-cvs
mailing list