From eda94d7f129f967f033072981017febfd6b79607 Mon Sep 17 00:00:00 2001 From: Andrew Kensler Date: Mon, 14 Aug 2017 16:14:40 -0700 Subject: [PATCH] Spell RenderMan with bi-caps in user-visible strings Made a pass to replace "Renderman" with "RenderMan" in user-visible strings and a few comments and text files. The official spelling uses bi-caps. Took a fairly conservative approach and generally left internal strings alone, however, in order to avoid potentially breaking things. --- changelog.txt | 26 ++++++++++++---------- export.py | 2 +- icons/icons.py | 6 ++--- nodes.py | 52 +++++++++++++++++++++---------------------- operators.py | 24 ++++++++++---------- preferences.py | 2 +- presets/properties.py | 6 ++--- presets/ui.py | 2 +- properties.py | 18 +++++++-------- ui.py | 10 ++++----- 10 files changed, 75 insertions(+), 73 deletions(-) diff --git a/changelog.txt b/changelog.txt index e835eea9..b3ffc587 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,13 +1,15 @@ v21.5.0 8/14/17 * Heat grid now available for Blender smoke sims cached with OpenVDB * RIB formatting now works with IPR renders -* Icons have been added to all ui panels that contain Renderman settings +* Icons have been added to all ui panels that contain RenderMan settings * Numerous fixes to the preset browser * Light rig presets now have correct world rotation * Can now update crop window during IPR * Viewport diffuse and specular color controls now work * Auto updater has been temporarily removed * Materials can now be linked directly to an object instance +* Update a few paths, URLs, and other details +* Spell RenderMan with bi-caps in user visible strings * RenderManForBlender is now being released under the MIT license * Code contributed by adminradio, a-e-k, bsavery, jdent02, and Lightye @@ -44,14 +46,14 @@ v21.2.0 11/8/16 * NOTE SIGNIFICANT CHANGE - Nodetrees are moved to use the built in cycles nodetree! * This will help file linking and allow node groups. * However you will have to redo your nodetrees. - * Cycles nodes can be used with Renderman shaders. - * this is still a work in progress. Some Cycles nodes will not function properly (or at all) with Renderman. + * Cycles nodes can be used with RenderMan shaders. + * this is still a work in progress. Some Cycles nodes will not function properly (or at all) with RenderMan. * Using "add renderman nodetree" will attempt to convert and hook up your cycles nodetree. * this is still a work in progress and won't give you an exact conversion. * New PxrSurface lobe AOV's. Due to changes in codebase you will have to reassign any existing AOV's to avoid export errors. * Support for PRMan 21 features - specifically new shaders and lights. * Portal lights are supported. -* Light filters are added - using a light and set it to "Filter type", then link the filters to your lights. +* Light filters are added - using a light and set it to "Filter type", then link the filters to your lights. * Sample and display filters are now under the scene properties. * Support for all Projection plugins (VR rendering with OmniDirectional!) under the camera props. * Icons are updated to renderman 21 icons. @@ -77,7 +79,7 @@ v0.9.0 7/13/16 * Render Selected button - quickly lets you render only a set of objects selected * Sampling presets to quickly change sampling settings (thanks rgordon) * Incremental rendering can now be disabled (it's on by default) -* Rib generation should be more stable +* Rib generation should be more stable * default OUT directory is now /tmp * cache sizes options are now available in advanced scene settings * curves can render as ribbons now or round curves (default) @@ -111,7 +113,7 @@ v0.8.0 03/22/2016 * !!! Longstanding IPR bug, the initial rendering with IPR no longer locks up Blender. v0.7.0 11/06/2015 -* Light shapes for area lights area now a selector control not on the shader. The shader setting will happen automagically. Also the shape for distant/point/spot lights should be correct now. +* Light shapes for area lights area now a selector control not on the shader. The shader setting will happen automagically. Also the shape for distant/point/spot lights should be correct now. v0.6.0 8/20/2015 * Light linking! @@ -123,14 +125,14 @@ v0.5.0 8/20/2015 * Backed out some multi-material changes until we have a proper bxdf switch node * Custom AOVs as well as specifying a lpe light group or object group works (please let me know any issues with this) * Little prettier shader swatch previews -* Crop windows/borders work. +* Crop windows/borders work. v0.4.0 8/3/2015 * OSL should now support IPR * more example files * RIB generation rewrite. ~6x speedup creating rib for gooseberry benchmark * uv's across multi-material objects should now work - * multi-material objects now use the same geometry instead of splitting it. + * multi-material objects now use the same geometry instead of splitting it. * however the current limitation is that multi-material objects can't be emissive * Metaball support (Thanks to @rendermouse!) * better deformation and multi-segment motion blur ribs. @@ -156,7 +158,7 @@ v0.2.6 7/13/2015 * Objects Geometry is output to a rib archive either under $SCENE/archives/static or $SCENE/archives/$FRAME_NUM if animated. * Objects Geometry is only output if the object is updated. For example if a scene is created, rendered, then re-rendered, the geometry would not be re-ribgenned. However if the object was updated in blender, it would update the rib. This will greatly speed ribgens but may cause issues if somehow an object is updated but the timestamp not updated. -In this case the archives directory can simply be removed, or the objects rib archive individually. +In this case the archives directory can simply be removed, or the objects rib archive individually. v0.2.5 7/13/2015 * INTERACTIVE RENDERING IS HERE!!!! @@ -235,7 +237,7 @@ v0.6.5 - 23/08/2011 v0.6.4 - 20/08/2011 -* Fix for not finding 3delight library correctly on Linux (ubuntu) +* Fix for not finding 3delight library correctly on Linux (ubuntu) v0.6.3 - 11/08/2011 @@ -285,11 +287,11 @@ Fixes: * Added manual shader initialisation to work around new limitations in bpy API * Attempted fixes for windows texture path troubles -New features: +New features: * Motion blurred dynamic hair support New features contributed by Magnus Löfgren: -* Support for deep shadow maps (Transparent Shadows), on by default +* Support for deep shadow maps (Transparent Shadows), on by default * Trace Motion Blur parameter now accessible, allowing motion blurred shadows diff --git a/export.py b/export.py index f4fe6721..cfc3122e 100644 --- a/export.py +++ b/export.py @@ -3633,7 +3633,7 @@ def make_dspy_info(scene): Create some render parameter from scene and pass it to image tool. If current scene renders to "it", collect some useful infos from scene - and send them alongside the render job to Rendermans image tool. Applies to + and send them alongside the render job to RenderMan's image tool. Applies to renderpass result only, does not affect postprocessing like denoise. """ params = {} diff --git a/icons/icons.py b/icons/icons.py index 7fe41921..8eb28153 100644 --- a/icons/icons.py +++ b/icons/icons.py @@ -114,10 +114,10 @@ def load_icons(): # Create OpenVDB Visualizer - # Renderman Doc + # RenderMan Doc custom_icons.load("help", os.path.join( icons_dir, "rman_help.png"), 'IMAGE') - # About Renderman + # About RenderMan custom_icons.load("info", os.path.join( icons_dir, "rman_info.png"), 'IMAGE') @@ -125,7 +125,7 @@ def load_icons(): custom_icons.load("reload_plugin", os.path.join( icons_dir, "rman_loadplugin.png"), 'IMAGE') - # Renderman for Blender UI-Panels Icon - "R" + # RenderMan for Blender UI-Panels Icon - "R" custom_icons.load("rfb_panel", os.path.join( icons_dir, "rman_blender.png"), 'IMAGE') diff --git a/nodes.py b/nodes.py index 81259bba..7ee93d32 100644 --- a/nodes.py +++ b/nodes.py @@ -127,9 +127,9 @@ def init_socket(self, node, socket, data_path): # socket types (need this just for the ui_open) class RendermanNodeSocketFloat(bpy.types.NodeSocketFloat, RendermanSocket): - '''Renderman float input/output''' + '''RenderMan float input/output''' bl_idname = 'RendermanNodeSocketFloat' - bl_label = 'Renderman Float Socket' + bl_label = 'RenderMan Float Socket' default_value = FloatProperty(update=update_func) renderman_type = StringProperty(default='float') @@ -139,9 +139,9 @@ def draw_color(self, context, node): class RendermanNodeSocketInterfaceFloat(bpy.types.NodeSocketInterfaceFloat, RendermanSocketInterface): - '''Renderman float input/output''' + '''RenderMan float input/output''' bl_idname = 'RendermanNodeSocketInterfaceFloat' - bl_label = 'Renderman Float Socket' + bl_label = 'RenderMan Float Socket' bl_socket_idname = 'RendermanNodeSocketFloat' default_value = FloatProperty() @@ -151,9 +151,9 @@ def draw_color(self, context): class RendermanNodeSocketInt(bpy.types.NodeSocketInt, RendermanSocket): - '''Renderman int input/output''' + '''RenderMan int input/output''' bl_idname = 'RendermanNodeSocketInt' - bl_label = 'Renderman Int Socket' + bl_label = 'RenderMan Int Socket' default_value = IntProperty(update=update_func) renderman_type = StringProperty(default='int') @@ -163,9 +163,9 @@ def draw_color(self, context, node): class RendermanNodeSocketInterfaceInt(bpy.types.NodeSocketInterfaceInt, RendermanSocketInterface): - '''Renderman float input/output''' + '''RenderMan float input/output''' bl_idname = 'RendermanNodeSocketInterfaceInt' - bl_label = 'Renderman Int Socket' + bl_label = 'RenderMan Int Socket' bl_socket_idname = 'RendermanNodeSocketInt' default_value = IntProperty() @@ -175,35 +175,35 @@ def draw_color(self, context): class RendermanNodeSocketString(bpy.types.NodeSocketString, RendermanSocket): - '''Renderman string input/output''' + '''RenderMan string input/output''' bl_idname = 'RendermanNodeSocketString' - bl_label = 'Renderman String Socket' + bl_label = 'RenderMan String Socket' default_value = StringProperty(update=update_func) is_texture = BoolProperty(default=False) renderman_type = StringProperty(default='string') class RendermanNodeSocketStruct(bpy.types.NodeSocketString, RendermanSocket): - '''Renderman struct input/output''' + '''RenderMan struct input/output''' bl_idname = 'RendermanNodeSocketStruct' - bl_label = 'Renderman Struct Socket' + bl_label = 'RenderMan Struct Socket' hide_value = True renderman_type = 'string' default_value = '' class RendermanNodeSocketInterfaceStruct(bpy.types.NodeSocketInterfaceString, RendermanSocketInterface): - '''Renderman struct input/output''' + '''RenderMan struct input/output''' bl_idname = 'RendermanNodeSocketInterfaceStruct' - bl_label = 'Renderman Struct Socket' + bl_label = 'RenderMan Struct Socket' bl_socket_idname = 'RendermanNodeSocketStruct' hide_value = True class RendermanNodeSocketColor(bpy.types.NodeSocketColor, RendermanSocket): - '''Renderman color input/output''' + '''RenderMan color input/output''' bl_idname = 'RendermanNodeSocketColor' - bl_label = 'Renderman Color Socket' + bl_label = 'RenderMan Color Socket' default_value = FloatVectorProperty(size=3, subtype="COLOR", update=update_func) @@ -214,9 +214,9 @@ def draw_color(self, context, node): class RendermanNodeSocketInterfaceColor(bpy.types.NodeSocketInterfaceColor, RendermanSocketInterface): - '''Renderman color input/output''' + '''RenderMan color input/output''' bl_idname = 'RendermanNodeSocketInterfaceColor' - bl_label = 'Renderman Color Socket' + bl_label = 'RenderMan Color Socket' bl_socket_idname = 'RendermanNodeSocketColor' default_value = FloatVectorProperty(size=3, @@ -227,9 +227,9 @@ def draw_color(self, context): class RendermanNodeSocketVector(RendermanSocket, bpy.types.NodeSocketVector): - '''Renderman vector input/output''' + '''RenderMan vector input/output''' bl_idname = 'RendermanNodeSocketVector' - bl_label = 'Renderman Vector Socket' + bl_label = 'RenderMan Vector Socket' hide_value = True default_value = FloatVectorProperty(size=3, @@ -241,9 +241,9 @@ def draw_color(self, context, node): class RendermanNodeSocketInterfaceVector(bpy.types.NodeSocketInterfaceVector, RendermanSocketInterface): - '''Renderman color input/output''' + '''RenderMan color input/output''' bl_idname = 'RendermanNodeSocketInterfaceVector' - bl_label = 'Renderman Vector Socket' + bl_label = 'RenderMan Vector Socket' bl_socket_idname = 'RendermanNodeSocketVector' hide_value = True @@ -257,18 +257,18 @@ def draw_color(self, context): class RendermanShaderSocket(bpy.types.NodeSocketShader, RendermanSocket): - '''Renderman shader input/output''' + '''RenderMan shader input/output''' bl_idname = 'RendermanShaderSocket' - bl_label = 'Renderman Shader Socket' + bl_label = 'RenderMan Shader Socket' hide_value = True # Custom socket type for connecting shaders class RendermanShaderSocketInterface(bpy.types.NodeSocketInterfaceShader, RendermanSocketInterface): - '''Renderman shader input/output''' + '''RenderMan shader input/output''' bl_idname = 'RendermanShaderInterfaceSocket' - bl_label = 'Renderman Shader Socket' + bl_label = 'RenderMan Shader Socket' bl_socket_idname = 'RendermanShaderSocket' hide_value = True diff --git a/operators.py b/operators.py index 181ab063..a27960b1 100644 --- a/operators.py +++ b/operators.py @@ -134,8 +134,8 @@ class SHADING_OT_convert_all_renderman_nodetree(bpy.types.Operator): '''''' bl_idname = "shading.convert_cycles_stuff" - bl_label = "Convert All Cycles to Renderman" - bl_description = "Convert all nodetrees to renderman" + bl_label = "Convert All Cycles to RenderMan" + bl_description = "Convert all nodetrees to RenderMan" def execute(self, context): for mat in bpy.data.materials: @@ -194,8 +194,8 @@ class SHADING_OT_add_renderman_nodetree(bpy.types.Operator): '''''' bl_idname = "shading.add_renderman_nodetree" - bl_label = "Add Renderman Nodetree" - bl_description = "Add a renderman shader node tree linked to this material" + bl_label = "Add RenderMan Nodetree" + bl_description = "Add a RenderMan shader node tree linked to this material" idtype = StringProperty(name="ID Type", default="material") bxdf_name = StringProperty(name="Bxdf Name", default="PxrSurface") @@ -613,9 +613,9 @@ def as_filename(name): # could reuse for other presets class AddPresetRendermanRender(AddPresetBase, bpy.types.Operator): - '''Add or remove a Renderman Sampling Preset''' + '''Add or remove a RenderMan Sampling Preset''' bl_idname = "render.renderman_preset_add" - bl_label = "Add Renderman Preset" + bl_label = "Add RenderMan Preset" bl_options = {'REGISTER', 'UNDO'} preset_menu = "presets" preset_defines = ["scene = bpy.context.scene", ] @@ -701,7 +701,7 @@ class RendermanRenderPresets(): class PresetsMenu(bpy.types.Menu): - bl_label = "Renderman Presets" + bl_label = "RenderMan Presets" bl_idname = "presets" preset_subdir = os.path.join("renderman", "render") preset_operator = "script.execute_preset" @@ -750,7 +750,7 @@ def loadFile(self, context, exampleName): class LoadSceneMenu(bpy.types.Menu): - bl_label = "RendermanExamples" + bl_label = "RenderMan Examples" bl_idname = "examples" def get_operator_failsafe(self, idname): @@ -1034,7 +1034,7 @@ def execute(self, context): class RM_Add_Area(bpy.types.Operator): bl_idname = "object.mr_add_area" - bl_label = "Add Renderman Area" + bl_label = "Add RenderMan Area" bl_description = "" bl_options = {"REGISTER", "UNDO"} @@ -1048,7 +1048,7 @@ def execute(self, context): class RM_Add_LightFilter(bpy.types.Operator): bl_idname = "object.mr_add_light_filter" - bl_label = "Add Renderman Light Filter" + bl_label = "Add RenderMan Light Filter" bl_description = "" bl_options = {"REGISTER", "UNDO"} @@ -1064,7 +1064,7 @@ def execute(self, context): class RM_Add_Hemi(bpy.types.Operator): bl_idname = "object.mr_add_hemi" - bl_label = "Add Renderman Hemi" + bl_label = "Add RenderMan Hemi" bl_description = "" bl_options = {"REGISTER", "UNDO"} @@ -1078,7 +1078,7 @@ def execute(self, context): class RM_Add_Sky(bpy.types.Operator): bl_idname = "object.mr_add_sky" - bl_label = "Add Renderman Sky" + bl_label = "Add RenderMan Sky" bl_description = "" bl_options = {"REGISTER", "UNDO"} diff --git a/preferences.py b/preferences.py index b27743de..478e8b0c 100644 --- a/preferences.py +++ b/preferences.py @@ -162,7 +162,7 @@ def find_installed_rendermans(self, context): draw_panel_icon = BoolProperty( name="Draw Panel Icon", - description="Draw an icon on Renderman Panels", + description="Draw an icon on RenderMan Panels", default=True) path_display_driver_image = StringProperty( diff --git a/presets/properties.py b/presets/properties.py index 5647cd8e..6e7da14d 100644 --- a/presets/properties.py +++ b/presets/properties.py @@ -37,7 +37,7 @@ # an actual preset class RendermanPreset(PropertyGroup): - bl_label = "Renderman Preset Group" + bl_label = "RenderMan Preset Group" bl_idname = 'RendermanPreset' #def get_enum_items(self, context): @@ -62,13 +62,13 @@ def get_from_path(cls, lib_path): # forward define preset group class RendermanPresetGroup(PropertyGroup): - bl_label = "Renderman Preset Group" + bl_label = "RenderMan Preset Group" bl_idname = 'RendermanPresetGroup' pass # A property group holds presets and sub groups class RendermanPresetGroup(PropertyGroup): - bl_label = "Renderman Preset Group" + bl_label = "RenderMan Preset Group" bl_idname = 'RendermanPresetGroup' @classmethod diff --git a/presets/ui.py b/presets/ui.py index cda62bb9..77145ab5 100644 --- a/presets/ui.py +++ b/presets/ui.py @@ -112,7 +112,7 @@ def draw(self, context): class Renderman_Presets_Menu(bpy.types.Menu): bl_idname = "renderman_presets_menu" - bl_label = "Renderman Presets Menu" + bl_label = "RenderMan Presets Menu" path = StringProperty(default="") diff --git a/properties.py b/properties.py index f819af53..47f3f83d 100644 --- a/properties.py +++ b/properties.py @@ -48,7 +48,7 @@ class RendermanCameraSettings(bpy.types.PropertyGroup): - bl_label = "Renderman Camera Settings" + bl_label = "RenderMan Camera Settings" bl_idname = 'RendermanCameraSettings' def get_projection_name(self): @@ -379,7 +379,7 @@ class RendermanRenderLayerSettings(bpy.types.PropertyGroup): exr_format_options = EnumProperty( name="EXR Bit Depth", - description="Sets the bit depth of the .exr file. Leaving at 'default' will use the Renderman defaults", + description="Sets the bit depth of the .exr file. Leaving at 'default' will use the RenderMan defaults", items=[ ('default', 'Default', ''), ('half', 'Half (16 bit)', ''), @@ -397,7 +397,7 @@ class RendermanRenderLayerSettings(bpy.types.PropertyGroup): exr_compression = EnumProperty( name="EXR Compression", - description="Determined the compression used on the EXR file. Leaving at 'default' will use the Renderman defaults", + description="Determined the compression used on the EXR file. Leaving at 'default' will use the RenderMan defaults", items=[ ('default', 'Default', ''), ('none', 'None', ''), @@ -811,7 +811,7 @@ def reset_ll_object_index(self, context): exr_format_options = EnumProperty( name="Bit Depth", - description="Sets the bit depth of the main EXR file. Leaving at 'default' will use the Renderman defaults", + description="Sets the bit depth of the main EXR file. Leaving at 'default' will use the RenderMan defaults", items=[ ('default', 'Default', ''), ('half', 'Half (16 bit)', ''), @@ -820,7 +820,7 @@ def reset_ll_object_index(self, context): exr_compression = EnumProperty( name="Compression", - description="Determined the compression used on the main EXR file. Leaving at 'default' will use the Renderman defaults", + description="Determined the compression used on the main EXR file. Leaving at 'default' will use the RenderMan defaults", items=[ ('default', 'Default', ''), ('none', 'None', ''), @@ -870,7 +870,7 @@ def reset_ll_object_index(self, context): do_render = BoolProperty( name="Initiate Renderer", - description="Spool RIB files to Renderman", + description="Spool RIB files to RenderMan", default=True) alf_options = BoolProperty( @@ -2213,11 +2213,11 @@ class RendermanObjectSettings(bpy.types.PropertyGroup): raytrace_override = BoolProperty( name="Ray Trace Override", - description="Override default Renderman ray tracing behavior. Recommended for advanced users only", + description="Override default RenderMan ray tracing behavior. Recommended for advanced users only", default=False) raytrace_pixel_variance = FloatProperty( name="Relative Pixel Variance", - description="Allows this object ot render to a different quality level than the main scene. Actual pixel variance will be this number multiplied by the main pixel variance", + description="Allows this object to render to a different quality level than the main scene. Actual pixel variance will be this number multiplied by the main pixel variance", default=1.0) raytrace_maxdiffusedepth = IntProperty( name="Max Diffuse Depth", @@ -2355,7 +2355,7 @@ class Tab_CollectionGroup(bpy.types.PropertyGroup): bpy.types.Scene.rm_help = BoolProperty( name="Help", - description="Show some links about Renderman and the documentation", + description="Show some links about RenderMan and the documentation", default=False) bpy.types.Scene.rm_env = BoolProperty( diff --git a/ui.py b/ui.py index 28e0d213..40eac0a3 100644 --- a/ui.py +++ b/ui.py @@ -1079,7 +1079,7 @@ class OBJECT_PT_renderman_object_geometry(Panel, CollectionPanel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "object" - bl_label = "Renderman Geometry" + bl_label = "RenderMan Geometry" @classmethod def poll(cls, context): @@ -1923,7 +1923,7 @@ def draw_item(self, layout, context, item): class Renderman_UI_Panel(bpy.types.Panel, _RManPanelHeader): bl_idname = "renderman_ui_panel" - bl_label = "Renderman " + bl_label = "RenderMan" bl_space_type = "VIEW_3D" bl_region_type = "TOOLS" bl_category = "Renderman" @@ -2421,7 +2421,7 @@ def draw(self, context): # Create OpenVDB Visualizer layout.separator() - # Renderman Doc + # RenderMan Doc rman_help = icons.get("help") layout.operator("wm.url_open", text="RenderMan Docs", icon_value=rman_help.icon_id).url = "https://github.com/prman-pixar/RenderManForBlender/wiki/Documentation-Home" @@ -2433,8 +2433,8 @@ def draw(self, context): # rman_reload = icons.get("reload_plugin") # layout.operator("renderman.restartaddon", icon_value=rman_reload.icon_id) - # Enable the menu item to display the examples menu in the Renderman - # Pannel. + # Enable the menu item to display the examples menu in the RenderMan + # Panel. layout.separator() layout.menu("examples", icon_value=rman_help.icon_id)