[Bf-blender-cvs] [f24bfcf] master: Cycles: Show Auto Smooth and Angle in the UI, after Split Normals are in.

[Thomas Dinges]

Commit: f24bfcffefa0eca74dbfb26f1e331c3f7a7da85e
Author: Thomas Dinges
Date:   Mon Apr 14 09:05:19 2014 +0200
https://developer.blender.org/rBf24bfcffefa0eca74dbfb26f1e331c3f7a7da85e

Cycles: Show Auto Smooth and Angle in the UI, after Split Normals are in.

===================================================================

M	intern/cycles/blender/addon/ui.py

===================================================================

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 6ef8aa7..e7c5e58 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -556,28 +556,6 @@ class Cycles_PT_mesh_displacement(CyclesButtonsPanel, Panel):
         layout.prop(cdata, "dicing_rate")
 
 
-class Cycles_PT_mesh_normals(CyclesButtonsPanel, Panel):
-    bl_label = "Normals"
-    bl_context = "data"
-
-    @classmethod
-    def poll(cls, context):
-        return CyclesButtonsPanel.poll(context) and context.mesh
-
-    def draw(self, context):
-        layout = self.layout
-
-        mesh = context.mesh
-
-        split = layout.split()
-
-        col = split.column()
-        col.prop(mesh, "show_double_sided")
-
-        col = split.column()
-        col.label()
-
-
 class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
     bl_label = "Motion Blur"
     bl_context = "object"
@@ -1356,6 +1334,7 @@ def get_panels():
         "DATA_PT_context_camera",
         "DATA_PT_context_lamp",
         "DATA_PT_context_speaker",
+        "DATA_PT_normals",
         "DATA_PT_texture_space",
         "DATA_PT_curve_texture_space",
         "DATA_PT_mball_texture_space",