From 7e932e56e1edacea91ff1287795788ba649ccf0f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 3 Sep 2013 22:06:58 +0000
Subject: [PATCH] rename normal_map -> normalmap, also remove fakeuser on
materials.
---
io_scene_fbx/cycles_shader_compat.py | 12 ++++++------
io_scene_fbx/import_fbx.py | 1 -
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/io_scene_fbx/cycles_shader_compat.py b/io_scene_fbx/cycles_shader_compat.py
index badfddbb2..2f1b9fb26 100644
--- a/io_scene_fbx/cycles_shader_compat.py
+++ b/io_scene_fbx/cycles_shader_compat.py
@@ -51,7 +51,7 @@ class CyclesShaderWrapper():
"node_mix_color_refl",
"node_mix_color_bump",
- "node_normal_map",
+ "node_normalmap",
"node_image_alpha",
"node_image_diff",
@@ -243,11 +243,11 @@ class CyclesShaderWrapper():
node.label = "Normal/Map"
node.location = self._grid_location(1, 2)
node.mute = True # unmute on use
- self.node_normal_map = node
+ self.node_normalmap = node
del node
# Link (with diff shader)
- socket_src = self.node_normal_map.outputs["Normal"]
+ socket_src = self.node_normalmap.outputs["Normal"]
links.new(socket_src,
self.node_bsdf_diff.inputs["Normal"])
# Link (with spec shader)
@@ -364,12 +364,12 @@ class CyclesShaderWrapper():
node.inputs["Color2"])
def normal_factor_set(self, value):
- node = self.node_normal_map
+ node = self.node_normalmap
node.inputs["Strength"].default_value = value
def normal_image_set(self, image):
- self.node_normal_map.mute = False
- node = self.node_normal_map
+ self.node_normalmap.mute = False
+ node = self.node_normalmap
(self.node_image_normalmap =
self._image_create_helper(image, node, (node.inputs["Color"],)))
self.node_image_normalmap.color_space = 'NONE'
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index 4fec65d3a..29f7acee0 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -726,7 +726,6 @@ def blen_read_material(fbx_tmpl, fbx_obj,
ma.raytrace_mirror.reflect_factor = ma_refl_factor
ma.mirror_color = ma_refl_color
- ma.use_fake_user = 1
return ma
--
GitLab