blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

UI: Rename RGB to Color #112471

Closed
Gangneron wants to merge 7 commits from (deleted):Rename_RGB_to_Color into main
pull from: (deleted):Rename_RGB_to_Color
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 11 Commits 7 Files Changed 3 +87 -69
Gangneron commented 2023-09-17 11:17:49 +02:00
First-time contributor
Copy Link

This patch replaces RGB and RGBA with Color for Shader nodes and compositir as indicated in Pr D14202 and as requested in #96219.

This patch replaces RGB and RGBA with Color for Shader nodes and compositir as indicated in Pr D14202 and as requested in #96219.
Gangneron added 1 commit 2023-09-17 11:17:57 +02:00
998b0649e4 Rename RGB to Color 
This patch replaces RGB and RGBA with Color as indicated in Pr D14202 and as requested in #96219.
Gangneron added 1 commit 2023-09-17 11:22:21 +02:00
634a426e90 Rename RGB to Color for shader node 
the input part of the node shader has been renamed Color instead of RGB.
Gangneron added 1 commit 2023-09-17 11:26:06 +02:00
e41bf3c09a Rename RGB to Color for shader node and compositor in NOD_static_types.h 
the input part of the node shader was renamed Color instead of RGB in NOD_static_types.h in order to correct the problem.
Gangneron commented 2023-09-17 11:28:45 +02:00
Author
First-time contributor
Copy Link

@pioverfour

@pioverfour
Gangneron requested review from Thomas Dinges 2023-09-17 11:29:49 +02:00
Gangneron commented 2023-09-17 11:30:59 +02:00
Author
First-time contributor
Copy Link

@brecht @HooglyBoogly @mod_moder

@brecht @HooglyBoogly @mod_moder
Gangneron changed title from Rename RGB to Color to UI :Rename RGB to Color 2023-09-17 11:32:27 +02:00
Gangneron changed title from UI :Rename RGB to Color to UI: Rename RGB to Color 2023-09-17 11:32:52 +02:00
Iliya Katushenock reviewed 2023-09-17 11:35:21 +02:00
Iliya Katushenock left a comment
Member
Copy Link

Hey, please, clear all unrelated changes from this PR, i did point only few examples.

Hey, please, clear all unrelated changes from this PR, i did point only few examples.
source/blender/nodes/NOD_static_types.h Outdated
@ -1,4 +1,4 @@
/* SPDX-FileCopyrightText: 2023 Blender Foundation
/* SPDX-FileCopyrightText: 2023 Blender Authors
Iliya Katushenock commented 2023-09-17 11:34:30 +02:00
Member
Copy Link

.

.
Gangneron marked this conversation as resolved
source/blender/nodes/NOD_static_types.h Outdated
@ -69,3 +69,3 @@
DefNode(ShaderNode, SH_NODE_BSDF_TRANSLUCENT, 0, "BSDF_TRANSLUCENT", BsdfTranslucent, "Translucent BSDF", "Lambertian diffuse transmission")
DefNode(ShaderNode, SH_NODE_BSDF_TRANSPARENT, 0, "BSDF_TRANSPARENT", BsdfTransparent, "Transparent BSDF", "Transparency without refraction, passing straight through the surface as if there were no geometry")
DefNode(ShaderNode, SH_NODE_BSDF_VELVET, 0, "BSDF_VELVET", BsdfVelvet, "Velvet BSDF", "Reflection for materials such as cloth.\nTypically mixed with other shaders (such as a Diffuse Shader) and is not particularly useful on its own")
DefNode(ShaderNode, SH_NODE_BSDF_SHEEN, def_sheen, "BSDF_SHEEN", BsdfSheen, "Sheen BSDF", "Reflection for materials such as cloth.\nTypically mixed with other shaders (such as a Diffuse Shader) and is not particularly useful on its own")
Iliya Katushenock commented 2023-09-17 11:34:28 +02:00
Member
Copy Link

.

.
source/blender/nodes/NOD_static_types.h Outdated
@ -266,3 +266,1 @@
DefNode(FunctionNode, FN_NODE_BOOLEAN_MATH, def_boolean_math, "BOOLEAN_MATH", BooleanMath, "Boolean Math", "")
DefNode(FunctionNode, FN_NODE_COMBINE_COLOR, def_fn_combsep_color, "COMBINE_COLOR", CombineColor, "Combine Color", "")
DefNode(FunctionNode, FN_NODE_COMPARE, def_compare, "COMPARE", Compare, "Compare", "")
DefNode(FunctionNode, FN_NODE_ALIGN_EULER_TO_VECTOR, 0, "ALIGN_EULER_TO_VECTOR", AlignEulerToVector, "Align Euler to Vector", "")
Iliya Katushenock commented 2023-09-17 11:34:25 +02:00
Member
Copy Link

.

.
source/blender/nodes/shader/nodes/node_shader_rgb.cc Outdated
@ -1,4 +1,4 @@
/* SPDX-FileCopyrightText: 2005 Blender Foundation
/* SPDX-FileCopyrightText: 2005 Blender Authors
Iliya Katushenock commented 2023-09-17 11:34:17 +02:00
Member
Copy Link

.

.
Gangneron marked this conversation as resolved
Gangneron added 1 commit 2023-09-17 11:50:31 +02:00
dd2d6834fd Fixed of problem 
change Authors for Foundation
Gangneron added 1 commit 2023-09-17 11:53:03 +02:00
662ddcf465 Fixed of problem 
chande Authors for foundation
Gangneron commented 2023-09-17 11:55:31 +02:00
Author
First-time contributor
Copy Link

@mod_moder should all the red parts on the NOD_static_types.h file be put back or not?

@mod_moder should all the red parts on the NOD_static_types.h file be put back or not?
Iliya Katushenock commented 2023-09-17 11:57:14 +02:00
Member
Copy Link

I strongly not sure if all of this changes is done by you, and that this related with Color name in just single line of whole file.

I strongly not sure if all of this changes is done by you, and that this related with `Color` name in just single line of whole file.
Gangneron commented 2023-09-17 12:00:16 +02:00
Author
First-time contributor
Copy Link

indeed the modifications made and which you asked me to correct are not modifications which I carried out myself. However, I can correct them

indeed the modifications made and which you asked me to correct are not modifications which I carried out myself. However, I can correct them
Gangneron commented 2023-09-17 12:03:49 +02:00
Author
First-time contributor
Copy Link

I saw that in the D14202 there was a file versioning_300.cc which was modified I looked and the modifications are present not certain value in particular are not quite the same

I saw that in the D14202 there was a file versioning_300.cc which was modified I looked and the modifications are present not certain value in particular are not quite the same
Gangneron commented 2023-09-17 12:06:04 +02:00
Author
First-time contributor
Copy Link

comparison between the 2 files (the old file is on a white background and the current file is on a black background) (on a black background the part begins line 3651)

comparison between the 2 files (the old file is on a white background and the current file is on a black background) (on a black background the part begins line 3651)
Capture d’écran (98).png
152 KiB
Capture d’écran (99).png
306 KiB
Capture d’écran (98).png Capture d’écran (99).png
Gangneron added 1 commit 2023-09-17 12:13:14 +02:00
22715159ba fixed problem 
Fixed of problem on NOD_static_types.h. 
change Authors for Foundation.
Fixed some problem for line
Gangneron commented 2023-09-17 12:17:34 +02:00
Author
First-time contributor
Copy Link

@mod_moder The changes you asked me for seem to pose a problem for the merge. I suggest simply correcting the Authors by replacing it with the Foundation and seeing.

@mod_moder The changes you asked me for seem to pose a problem for the merge. I suggest simply correcting the Authors by replacing it with the Foundation and seeing.
Gangneron added 1 commit 2023-09-17 15:13:09 +02:00
Blender Bot commented 2023-09-17 19:09:00 +02:00
Member
Copy Link

Only blender organization members with write access can start builds. See documentation for details.

Only blender organization members with write access can start builds. See [documentation](https://projects.blender.org/infrastructure/blender-bot/src/branch/main/README.md) for details.
Brecht Van Lommel commented 2023-09-18 16:48:39 +02:00
Owner
Copy Link

This is an API breaking change, and because of reasons discussed in #96219 we can not do this yet.

Since 4.0 is already getting close to release and a significant amount of work would be needed to do the refactoring, these breaking changes will be postponed to 5.0.

This is an API breaking change, and because of reasons discussed in #96219 we can not do this yet. Since 4.0 is already getting close to release and a significant amount of work would be needed to do the refactoring, these breaking changes will be postponed to 5.0.
Thomas Dinges refused to review 2023-10-06 16:45:37 +02:00
Thomas Dinges closed this pull request 2024-01-04 16:41:17 +01:00
Thomas Dinges commented 2024-01-04 16:44:07 +01:00
Owner
Copy Link

For reference, Gangneron asked me to delete his fork of Blender, cause he got server errors when updating/creating a PR. That's why this PR got auto closed.

For reference, Gangneron asked me to delete his fork of Blender, cause he got server errors when updating/creating a PR. That's why this PR got auto closed.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset Browser

  
Interest
Asset Browser Project Overview

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
This issue affects/is about backward or forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
EEVEE & Viewport

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Issues relating to Wayland windowing support.

  
Interest
Workbench

  
Interest: X11

Issues relating to Xorg/X11 support.

  
Legacy
Blender 2.8 Project

  
Legacy
Milestone 1: Basic, Local Asset Browser

  
Legacy
OpenGL Error

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
EEVEE & Viewport

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Priority
High

  
Priority
Low

  
Priority
Normal

  
Priority
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

  
Type
Report

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
5 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#112471
No description provided.
Delete Branch "(deleted):Rename_RGB_to_Color"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?