blender/blender
163
517
Fork 787
Code Issues 6.8k Pull Requests 940 Projects 19 Wiki Activity

Versioning function to replace legacy instancing panel by geometry node modifier #105494

Open
Iliya Katushenock wants to merge 44 commits from mod_moder/blender:instances into main
pull from: mod_moder/blender:instances
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 44 Files Changed 7 +1139 -2
Iliya Katushenock commented 2023-03-06 16:27:49 +01:00
Member
Copy Link

TODO's:

  • Should Realize Instances exist?
  • Add Invert Euler node group instead of current way to clear instances rotation.

User usability:

  • New algoritm to push apart nodes form spawn point.
  • Add all Object Info nodes in a frame node.

Optionaly:

  • More tests in other project files?
  • Hide all unused sockets?
  • Rename all nodes to make it easy to understand?

See: #105321

TODO's: - [x] Should `Realize Instances` exist? - [x] Add `Invert Euler` node group instead of current way to clear instances rotation. User usability: - [ ] New algoritm to push apart nodes form spawn point. - [ ] Add all `Object Info` nodes in a frame node. Optionaly: - [ ] More tests in other project files? - [ ] Hide all unused sockets? - [ ] Rename all nodes to make it easy to understand? See: https://projects.blender.org/blender/blender/issues/105321
❤️ 3
Iliya Katushenock added 1 commit 2023-03-06 16:28:00 +01:00
Iliya Katushenock added this to the Nodes & Physics project 2023-03-06 16:28:10 +01:00
Iliya Katushenock added 3 commits 2023-03-07 18:47:26 +01:00 
fix crash, create object info nodes
Brecht Van Lommel reviewed 2023-03-07 21:39:49 +01:00
source/blender/blenloader/intern/versioning_300.cc Outdated
@ -1213,6 +1213,10 @@ void do_versions_after_linking_300(FileData * /*fd*/, Main *bmain)
FOREACH_NODETREE_END;
}
if (!MAIN_VERSION_ATLEAST(bmain, 306, 1)) {
Brecht Van Lommel commented 2023-03-07 21:39:49 +01:00
Owner
Copy Link

This is WIP so perhaps this is just temporary, but when this gets committed it should check for 4.0 here.

There's no way to make this work exactly the same taking into account various corner cases and scripting, so doing it in 3.6 would be too early.

This is WIP so perhaps this is just temporary, but when this gets committed it should check for 4.0 here. There's no way to make this work exactly the same taking into account various corner cases and scripting, so doing it in 3.6 would be too early.
Iliya Katushenock commented 2023-03-07 21:42:43 +01:00
Author
Member
Copy Link

So far, I've been thinking it's better to just have a versioning that brings all current users projects to geometry nodes. Thus, by the time the rest of the legacy parts are removed, it would have already been tested and most users would be ready for this.

So far, I've been thinking it's better to just have a versioning that brings all current users projects to geometry nodes. Thus, by the time the rest of the legacy parts are removed, it would have already been tested and most users would be ready for this.
mod_moder marked this conversation as resolved
Iliya Katushenock added 3 commits 2023-04-07 22:07:57 +02:00 
delete redurant inclide
Iliya Katushenock added 2 commits 2023-04-15 23:59:19 +02:00
Iliya Katushenock added 1 commit 2023-04-16 00:57:07 +02:00
Iliya Katushenock added 2 commits 2023-04-16 21:08:42 +02:00
Iliya Katushenock added 1 commit 2023-04-16 22:16:35 +02:00
Iliya Katushenock added 2 commits 2023-04-17 17:11:28 +02:00
Iliya Katushenock added 2 commits 2023-04-17 19:55:04 +02:00
Iliya Katushenock added 2 commits 2023-04-25 20:47:40 +02:00
Iliya Katushenock added 8 commits 2023-04-26 22:49:46 +02:00
Iliya Katushenock added 5 commits 2023-05-01 22:01:27 +02:00
Iliya Katushenock added 2 commits 2023-05-08 14:56:51 +02:00
Iliya Katushenock added 1 commit 2023-05-21 01:09:23 +02:00
Iliya Katushenock changed title from WIP: Versioning function to replace legacy instancing panel by geometry node modifier to Versioning function to replace legacy instancing panel by geometry node modifier 2023-05-21 01:11:24 +02:00
Iliya Katushenock added 1 commit 2023-05-21 01:34:41 +02:00
Iliya Katushenock added 1 commit 2023-05-27 17:27:11 +02:00
Iliya Katushenock added 1 commit 2023-05-27 23:13:37 +02:00
Iliya Katushenock added 1 commit 2023-05-27 23:27:37 +02:00
Iliya Katushenock added 1 commit 2023-05-28 01:00:18 +02:00
Iliya Katushenock added 2 commits 2023-05-28 01:38:43 +02:00
Iliya Katushenock added 1 commit 2023-05-28 17:18:26 +02:00
Iliya Katushenock added 1 commit 2023-06-01 01:44:05 +02:00
Bastien Montagne requested changes 2023-08-15 17:00:04 +02:00
source/blender/blenloader/intern/versioning_400.cc
@ -30,3 +30,3 @@
void do_versions_after_linking_400(FileData * /*fd*/, Main *bmain)
{
UNUSED_VARS(bmain);
if (!MAIN_VERSION_ATLEAST(bmain, 400, 3)) {
Bastien Montagne commented 2023-08-15 16:59:49 +02:00
Owner
Copy Link

Creating IDs in versioning code is forbidden. Until a better system (more generic) is implemented, a specific call needs to be added after all versioning is done, see e.g. the call to BKE_lib_override_library_main_proxy_convert in setup_app_data()

Creating IDs in versioning code is forbidden. Until a better system (more generic) is implemented, a specific call needs to be added after all versioning is done, see e.g. the call to `BKE_lib_override_library_main_proxy_convert` in `setup_app_data()`
This pull request has changes conflicting with the target branch.
  • source/blender/blenkernel/BKE_idprop.h
  • source/blender/blenloader/intern/versioning_400.cc
  • source/blender/blenloader/intern/versioning_common.cc
  • source/blender/blenloader/intern/versioning_common.h
  • source/blender/nodes/geometry/nodes/node_geo_common.cc
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u instances:mod_moder-instances
git checkout mod_moder-instances
Sign in to join this conversation.
Reviewers
No reviewers
Bastien Montagne
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Code Documentation
Code comments, Python/RNA API descriptions

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
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
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, see policy: https://developer.blender.org/docs/handbook/bug_reports/vulnerability_reports/

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
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

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
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

Archived

  
Type
Report

Archived

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Code Documentation
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
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
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
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
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
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
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
Nodes & Physics
Assignees
Clear assignees
No Assignees
3 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#105494
No description provided.
Delete Branch "mod_moder/blender:instances"

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?