Revision: 54305
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54305
Author: dingto
Date: 2013-02-04 18:50:09 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
Cycles UI Code:
* Some more variable cleanup for old texture output.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/kernel/kernel_sse2.cpp
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-02-04 17:38:37 UTC
(rev 54304)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-02-04 18:50:09 UTC
(rev 54305)
@@ -875,7 +875,6 @@
@classmethod
def poll(cls, context):
- tex = context.texture
node = context.texture_node
return node and CyclesButtonsPanel.poll(context)
@@ -907,15 +906,13 @@
@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
Modified: trunk/blender/intern/cycles/kernel/kernel_sse2.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_sse2.cpp 2013-02-04 17:38:37 UTC
(rev 54304)
+++ trunk/blender/intern/cycles/kernel/kernel_sse2.cpp 2013-02-04 18:50:09 UTC
(rev 54305)
@@ -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. */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
