Revision: 57700
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57700
Author: psy-fi
Date: 2013-06-24 13:38:28 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
Merge trunk -r57697 into soc-2013-paint
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57697
Modified Paths:
--------------
branches/soc-2013-paint/source/blender/collada/AnimationExporter.h
branches/soc-2013-paint/source/blender/collada/SkinInfo.cpp
branches/soc-2013-paint/source/blender/editors/include/ED_object.h
branches/soc-2013-paint/source/blender/editors/interface/interface_panel.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
Modified: branches/soc-2013-paint/source/blender/collada/AnimationExporter.h
===================================================================
--- branches/soc-2013-paint/source/blender/collada/AnimationExporter.h
2013-06-24 13:38:15 UTC (rev 57699)
+++ branches/soc-2013-paint/source/blender/collada/AnimationExporter.h
2013-06-24 13:38:28 UTC (rev 57700)
@@ -35,6 +35,7 @@
#include "DNA_armature_types.h"
#include "DNA_material_types.h"
#include "DNA_constraint_types.h"
+#include "DNA_scene_types.h"
#include "BLI_math.h"
#include "BLI_string.h"
Modified: branches/soc-2013-paint/source/blender/collada/SkinInfo.cpp
===================================================================
--- branches/soc-2013-paint/source/blender/collada/SkinInfo.cpp 2013-06-24
13:38:15 UTC (rev 57699)
+++ branches/soc-2013-paint/source/blender/collada/SkinInfo.cpp 2013-06-24
13:38:28 UTC (rev 57700)
@@ -37,6 +37,7 @@
#include "BKE_object.h"
#include "DNA_armature_types.h"
#include "DNA_modifier_types.h"
+#include "DNA_scene_types.h"
#include "ED_mesh.h"
#include "ED_object.h"
#include "BKE_action.h"
Modified: branches/soc-2013-paint/source/blender/editors/include/ED_object.h
===================================================================
--- branches/soc-2013-paint/source/blender/editors/include/ED_object.h
2013-06-24 13:38:15 UTC (rev 57699)
+++ branches/soc-2013-paint/source/blender/editors/include/ED_object.h
2013-06-24 13:38:28 UTC (rev 57700)
@@ -69,8 +69,6 @@
struct PropertyRNA;
struct EnumPropertyItem;
-enum eVGroupSelect;
-
/* object_edit.c */
struct Object *ED_object_context(struct bContext *C); /*
context.object */
struct Object *ED_object_active_context(struct bContext *C); /* context.object
or context.active_object */
Modified:
branches/soc-2013-paint/source/blender/editors/interface/interface_panel.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/interface/interface_panel.c
2013-06-24 13:38:15 UTC (rev 57699)
+++ branches/soc-2013-paint/source/blender/editors/interface/interface_panel.c
2013-06-24 13:38:28 UTC (rev 57700)
@@ -472,8 +472,10 @@
const char *activename = panel->drawname[0] ? panel->drawname :
panel->panelname;
/* + 0.001f to avoid flirting with float inaccuracy */
- if (panel->control & UI_PNL_CLOSE) pnl_icons = (panel->labelofs + 2 *
PNL_ICON + 5) / block->aspect + 0.001f;
- else pnl_icons = (panel->labelofs + PNL_ICON + 5) / block->aspect +
0.001f;
+ if (panel->control & UI_PNL_CLOSE)
+ pnl_icons = (panel->labelofs + 2 * PNL_ICON + 5) /
block->aspect + 0.001f;
+ else
+ pnl_icons = (panel->labelofs + PNL_ICON + 5) / block->aspect +
0.001f;
/* active tab */
/* draw text label */
@@ -514,7 +516,7 @@
rcti headrect;
rctf itemrect;
int ofsx;
-
+
if (panel->paneltab) return;
if (panel->type && (panel->type->flag & PNL_NO_HEADER)) return;
@@ -523,14 +525,14 @@
headrect = *rect;
headrect.ymin = headrect.ymax;
headrect.ymax = headrect.ymin + floor(PNL_HEADER / block->aspect +
0.001f);
-
+
{
float minx = rect->xmin;
float maxx = rect->xmax;
float y = headrect.ymax;
glEnable(GL_BLEND);
-
+
if (UI_GetThemeValue(TH_PANEL_SHOW_HEADER)) {
/* draw with background color */
UI_ThemeColor4(TH_PANEL_HEADER);
@@ -543,7 +545,7 @@
/* draw embossed separator */
minx += 5.0f / block->aspect;
maxx -= 5.0f / block->aspect;
-
+
glColor4f(0.0f, 0.0f, 0.0f, 0.5f);
fdrawline(minx, y, maxx, y);
glColor4f(1.0f, 1.0f, 1.0f, 0.25f);
@@ -552,11 +554,11 @@
glDisable(GL_BLEND);
}
-
+
/* horizontal title */
if (!(panel->flag & PNL_CLOSEDX)) {
ui_draw_aligned_panel_header(style, block, &headrect, 'h');
-
+
/* itemrect smaller */
itemrect.xmax = headrect.xmax - 5.0f / block->aspect;
itemrect.xmin = itemrect.xmax - BLI_rcti_size_y(&headrect);
@@ -566,12 +568,11 @@
rectf_scale(&itemrect, 0.7f);
ui_draw_panel_dragwidget(&itemrect);
}
-
+
/* if the panel is minimized vertically:
* (------)
*/
if (panel->flag & PNL_CLOSEDY) {
-
}
else if (panel->flag & PNL_CLOSEDX) {
/* draw vertical title */
@@ -579,16 +580,15 @@
}
/* an open panel */
else {
-
/* in some occasions, draw a border */
if (panel->flag & PNL_SELECT) {
if (panel->control & UI_PNL_SOLID)
uiSetRoundBox(UI_CNR_ALL);
else uiSetRoundBox(UI_CNR_NONE);
-
+
UI_ThemeColorShade(TH_BACK, -120);
uiRoundRect(0.5f + rect->xmin, 0.5f + rect->ymin, 0.5f
+ rect->xmax, 0.5f + headrect.ymax + 1, 8);
}
-
+
/* panel backdrop */
if (UI_GetThemeValue(TH_PANEL_SHOW_BACK)) {
/* draw with background color */
@@ -596,32 +596,31 @@
UI_ThemeColor4(TH_PANEL_BACK);
glRecti(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
}
-
+
if (panel->control & UI_PNL_SCALE)
ui_draw_panel_scalewidget(rect);
}
-
+
/* draw optional close icon */
-
+
ofsx = 6;
if (panel->control & UI_PNL_CLOSE) {
-
- UI_ThemeColor(TH_TEXT);
+ UI_ThemeColor(TH_TITLE);
ui_draw_x_icon(rect->xmin + 2 + ofsx, rect->ymax + 2);
ofsx = 22;
}
-
+
/* draw collapse icon */
- UI_ThemeColor(TH_TEXT);
-
+ UI_ThemeColor(TH_TITLE);
+
/* itemrect smaller */
itemrect.xmin = headrect.xmin + 5.0f / block->aspect;
itemrect.xmax = itemrect.xmin + BLI_rcti_size_y(&headrect);
itemrect.ymin = headrect.ymin;
itemrect.ymax = headrect.ymax;
-
+
rectf_scale(&itemrect, 0.35f);
-
+
if (panel->flag & PNL_CLOSEDY)
ui_draw_tria_rect(&itemrect, 'h');
else if (panel->flag & PNL_CLOSEDX)
Modified: branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
2013-06-24 13:38:15 UTC (rev 57699)
+++ branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
2013-06-24 13:38:28 UTC (rev 57700)
@@ -148,7 +148,7 @@
{BCONTEXT_MODIFIER, "MODIFIER", ICON_MODIFIER, "Modifiers", "Object
modifiers"},
{BCONTEXT_DATA, "DATA", ICON_NONE, "Data", "Object data"},
{BCONTEXT_BONE, "BONE", ICON_BONE_DATA, "Bone", "Bone"},
- {BCONTEXT_BONE_CONSTRAINT, "BONE_CONSTRAINT", ICON_CONSTRAINT, "Bone
Constraints", "Bone constraints"},
+ {BCONTEXT_BONE_CONSTRAINT, "BONE_CONSTRAINT", ICON_CONSTRAINT_BONE,
"Bone Constraints", "Bone constraints"},
{BCONTEXT_MATERIAL, "MATERIAL", ICON_MATERIAL, "Material", "Material"},
{BCONTEXT_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture"},
{BCONTEXT_PARTICLE, "PARTICLES", ICON_PARTICLES, "Particles",
"Particle"},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
