[Bf-blender-cvs] [aa42600] wiggly-widgets: Sync with master

Campbell Barton noreply at git.blender.org
Mon Jan 4 18:13:26 CET 2016


Commit: aa4260064cde273ccfbae88712a6bec3a74ca757
Author: Campbell Barton
Date:   Tue Jan 5 03:32:44 2016 +1100
Branches: wiggly-widgets
https://developer.blender.org/rBaa4260064cde273ccfbae88712a6bec3a74ca757

Sync with master

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

M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	source/blender/blenkernel/BKE_context.h
M	source/blender/blenkernel/intern/context.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 77b2be4..d573582 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -349,7 +349,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
                     row = layout.row()
                     row.active = enable_edit_value
                     row.prop(kb, "value")
- 
+
                     split = layout.split()
 
                     col = split.column(align=True)
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 205b96c..f7af3a7 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -58,7 +58,6 @@ struct bPoseChannel;
 struct bGPdata;
 struct bGPDlayer;
 struct bGPDframe;
-struct wmWidget;
 struct wmWindow;
 struct wmWindowManager;
 struct SpaceText;
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 91343d9..d223a3a 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -58,8 +58,6 @@
 
 /* struct */
 
-struct wmWidget;
-
 struct bContext {
 	int thread;




More information about the Bf-blender-cvs mailing list