Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles UI Code:

Browse Source 
* Some more variable cleanup for old texture output.
This commit is contained in:
Thomas Dinges
2013-02-04 18:50:09 +00:00
parent ea723386c3
commit 13499c6240
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/addon/ui.py
View File

@@ -875,7 +875,6 @@ class CyclesTexture_PT_mapping(CyclesButtonsPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
tex = context.texture
node = context.texture_node node = context.texture_node
return node and CyclesButtonsPanel.poll(context) return node and CyclesButtonsPanel.poll(context)
@@ -907,15 +906,13 @@ class CyclesTexture_PT_colors(CyclesButtonsPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
# tex = context.texture
# node = context.texture_node # node = context.texture_node
return False return False
#return (node or (tex and tex.use_nodes)) and CyclesButtonsPanel.poll(context) #return node and CyclesButtonsPanel.poll(context)
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
# tex = context.texture
node = context.texture_node node = context.texture_node
mapping = node.color_mapping mapping = node.color_mapping

2
intern/cycles/kernel/kernel_sse2.cpp
View File

@@ -16,7 +16,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 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 * optimization flags and nearly all functions inlined, while kernel.cpp
* is compiled without for other CPU's. */ * is compiled without for other CPU's. */