blender/blender-addons
19
43
Fork 96
Code Issues 630 Pull Requests 27 Projects 1 Releases Wiki Activity

io_import_dxf: Fix ZeroDivision #104553

Closed
Oxicid wants to merge 2 commits from (deleted):oxicid-dxf-vector-normalized into main
pull from: (deleted):oxicid-dxf-vector-normalized
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 2 Files Changed 2 +4 -7
Oxicid commented 2023-04-17 21:16:45 +02:00
Contributor
Copy Link

Vector normalization now takes place through the built-in module #104531

Vector normalization now takes place through the built-in module #104531
Oxicid added 2 commits 2023-04-17 21:16:47 +02:00
Oxicid requested review from Brecht Van Lommel 2023-04-17 21:17:35 +02:00
Brecht Van Lommel approved these changes 2023-04-18 15:43:01 +02:00
Brecht Van Lommel left a comment
Owner
Copy Link

Looks fine, will merge when you resolve the conflict.

Looks fine, will merge when you resolve the conflict.
Oxicid commented 2023-04-18 15:50:01 +02:00
Author
Contributor
Copy Link

Looks fine, will merge when you resolve the conflict.

And what is the right way to resolve the conflict. Recreate the PR with the updated branch? I just haven't fully mastered the git system

> Looks fine, will merge when you resolve the conflict. And what is the right way to resolve the conflict. Recreate the PR with the updated branch? I just haven't fully mastered the git system
Brecht Van Lommel commented 2023-04-18 16:16:21 +02:00
Owner
Copy Link

See here::
https://wiki.blender.org/wiki/Tools/Pull_Requests#Update_a_Pull_Request

Basically you just push to the same branch again to update this PR.

See here:: https://wiki.blender.org/wiki/Tools/Pull_Requests#Update_a_Pull_Request Basically you just push to the same branch again to update this PR.
Oxicid closed this pull request 2023-04-18 19:34:05 +02:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Brecht Van Lommel
Labels
Clear labels   
Interest
Animation & Rigging

  
Interest
Blender Cloud

  
Interest
Collada

  
Interest
Core

  
Interest
Documentation

  
Interest
Eevee & Viewport

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
Import and Export

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Nodes & Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds, Tests & Devices

  
Interest
Python API

  
Interest
Rendering & Cycles

  
Interest
Sculpt, Paint & Texture

  
Interest
Translations

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Meta
Good First Issue

  
Meta
Papercut

  
Module
Add-ons (BF-Blender)

  
Module
Add-ons (Community)

  
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
Animation & Rigging
Interest
Blender Cloud
Interest
Collada
Interest
Core
Interest
Documentation
Interest
Eevee & Viewport
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
Import and Export
Interest
Modeling
Interest
Modifiers
Interest
Nodes & Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds, Tests & Devices
Interest
Python API
Interest
Rendering & Cycles
Interest
Sculpt, Paint & Texture
Interest
Translations
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Meta
Good First Issue
Meta
Papercut
Module
Add-ons (BF-Blender)
Module
Add-ons (Community)
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
2 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-addons#104553
No description provided.
Delete Branch "(deleted):oxicid-dxf-vector-normalized"

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?