Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-addons
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-addons
Commits
7e932e56
Commit
7e932e56
authored
11 years ago
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
rename normal_map -> normalmap, also remove fakeuser on materials.
parent
5cd33cec
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
io_scene_fbx/cycles_shader_compat.py
+6
-6
6 additions, 6 deletions
io_scene_fbx/cycles_shader_compat.py
io_scene_fbx/import_fbx.py
+0
-1
0 additions, 1 deletion
io_scene_fbx/import_fbx.py
with
6 additions
and
7 deletions
io_scene_fbx/cycles_shader_compat.py
+
6
−
6
View file @
7e932e56
...
@@ -51,7 +51,7 @@ class CyclesShaderWrapper():
...
@@ -51,7 +51,7 @@ class CyclesShaderWrapper():
"
node_mix_color_refl
"
,
"
node_mix_color_refl
"
,
"
node_mix_color_bump
"
,
"
node_mix_color_bump
"
,
"
node_normal
_
map
"
,
"
node_normalmap
"
,
"
node_image_alpha
"
,
"
node_image_alpha
"
,
"
node_image_diff
"
,
"
node_image_diff
"
,
...
@@ -243,11 +243,11 @@ class CyclesShaderWrapper():
...
@@ -243,11 +243,11 @@ class CyclesShaderWrapper():
node
.
label
=
"
Normal/Map
"
node
.
label
=
"
Normal/Map
"
node
.
location
=
self
.
_grid_location
(
1
,
2
)
node
.
location
=
self
.
_grid_location
(
1
,
2
)
node
.
mute
=
True
# unmute on use
node
.
mute
=
True
# unmute on use
self
.
node_normal
_
map
=
node
self
.
node_normalmap
=
node
del
node
del
node
# Link (with diff shader)
# Link (with diff shader)
socket_src
=
self
.
node_normal
_
map
.
outputs
[
"
Normal
"
]
socket_src
=
self
.
node_normalmap
.
outputs
[
"
Normal
"
]
links
.
new
(
socket_src
,
links
.
new
(
socket_src
,
self
.
node_bsdf_diff
.
inputs
[
"
Normal
"
])
self
.
node_bsdf_diff
.
inputs
[
"
Normal
"
])
# Link (with spec shader)
# Link (with spec shader)
...
@@ -364,12 +364,12 @@ class CyclesShaderWrapper():
...
@@ -364,12 +364,12 @@ class CyclesShaderWrapper():
node
.
inputs
[
"
Color2
"
])
node
.
inputs
[
"
Color2
"
])
def
normal_factor_set
(
self
,
value
):
def
normal_factor_set
(
self
,
value
):
node
=
self
.
node_normal
_
map
node
=
self
.
node_normalmap
node
.
inputs
[
"
Strength
"
].
default_value
=
value
node
.
inputs
[
"
Strength
"
].
default_value
=
value
def
normal_image_set
(
self
,
image
):
def
normal_image_set
(
self
,
image
):
self
.
node_normal
_
map
.
mute
=
False
self
.
node_normalmap
.
mute
=
False
node
=
self
.
node_normal
_
map
node
=
self
.
node_normalmap
(
self
.
node_image_normalmap
=
(
self
.
node_image_normalmap
=
self
.
_image_create_helper
(
image
,
node
,
(
node
.
inputs
[
"
Color
"
],)))
self
.
_image_create_helper
(
image
,
node
,
(
node
.
inputs
[
"
Color
"
],)))
self
.
node_image_normalmap
.
color_space
=
'
NONE
'
self
.
node_image_normalmap
.
color_space
=
'
NONE
'
...
...
This diff is collapsed.
Click to expand it.
io_scene_fbx/import_fbx.py
+
0
−
1
View file @
7e932e56
...
@@ -726,7 +726,6 @@ def blen_read_material(fbx_tmpl, fbx_obj,
...
@@ -726,7 +726,6 @@ def blen_read_material(fbx_tmpl, fbx_obj,
ma
.
raytrace_mirror
.
reflect_factor
=
ma_refl_factor
ma
.
raytrace_mirror
.
reflect_factor
=
ma_refl_factor
ma
.
mirror_color
=
ma_refl_color
ma
.
mirror_color
=
ma_refl_color
ma
.
use_fake_user
=
1
return
ma
return
ma
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment