Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
15f4b217
Commit
15f4b217
authored
Feb 19, 2023
by
AUTOMATIC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the a merge conflict resolve i did that entirely breaks image generation
parent
a77ac2ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
processing.py
modules/processing.py
+0
-3
No files found.
modules/processing.py
View file @
15f4b217
...
...
@@ -580,9 +580,6 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
if
shared
.
opts
.
live_previews_enable
and
opts
.
show_progress_type
==
"Approx NN"
:
sd_vae_approx
.
model
()
if
not
p
.
disable_extra_networks
:
extra_networks
.
activate
(
p
,
extra_network_data
)
if
state
.
job_count
==
-
1
:
state
.
job_count
=
p
.
n_iter
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment