Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-02-04 22:50:09 +0400
committerThomas Dinges <blender@dingto.org>2013-02-04 22:50:09 +0400
commit13499c6240e9c4d69dc26a45a3b6bcbf11e8b414 (patch)
tree98f251351b41d6b3cbff220c81a85d0dab373474 /intern
parentea723386c31e4c691e6a64f6c69a83b30f8c3010 (diff)
Cycles UI Code:
* Some more variable cleanup for old texture output.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py7
-rw-r--r--intern/cycles/kernel/kernel_sse2.cpp2
2 files changed, 3 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 5e5f9b03e2c..840fc216c49 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -875,7 +875,6 @@ class CyclesTexture_PT_mapping(CyclesButtonsPanel, Panel):
@classmethod
def poll(cls, context):
- tex = context.texture
node = context.texture_node
return node and CyclesButtonsPanel.poll(context)
@@ -907,15 +906,13 @@ class CyclesTexture_PT_colors(CyclesButtonsPanel, Panel):
@classmethod
def poll(cls, context):
- # tex = context.texture
# node = context.texture_node
return False
- #return (node or (tex and tex.use_nodes)) and CyclesButtonsPanel.poll(context)
+ #return node and CyclesButtonsPanel.poll(context)
def draw(self, context):
layout = self.layout
-
- # tex = context.texture
+
node = context.texture_node
mapping = node.color_mapping
diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp
index 7947107a43c..e9d482ae5cf 100644
--- a/intern/cycles/kernel/kernel_sse2.cpp
+++ b/intern/cycles/kernel/kernel_sse2.cpp
@@ -16,7 +16,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* Optimized CPU kernel entry points. This file is compiled with SSE3
+/* Optimized CPU kernel entry points. This file is compiled with SSE2
* optimization flags and nearly all functions inlined, while kernel.cpp
* is compiled without for other CPU's. */