Commit: 20af89484624c0dd076ef3efb19df7ab7f792f7e
Author: Campbell Barton
Date: Tue Jan 5 04:03:14 2016 +1100
Branches: wiggly-widgets
https://developer.blender.org/rB20af89484624c0dd076ef3efb19df7ab7f792f7e
Sync /w master
===================================================================
M release/scripts/startup/bl_ui/properties_object.py
M source/blender/blenkernel/BKE_object_deform.h
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/armature/pose_utils.c
M source/blender/editors/object/object_fmap.c
M source/blender/editors/object/object_shapekey.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/transform/transform_ops.c
M source/blender/makesdna/DNA_key_types.h
D source/blender/windowmanager/SConscript
M source/blender/windowmanager/intern/wm.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_object.py
b/release/scripts/startup/bl_ui/properties_object.py
index cd3bfd5..9009535 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -124,6 +124,7 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel):
sub.active = ob.lock_rotations_4d
sub.prop(ob, "lock_rotation_w", text="W")
+
class OBJECT_PT_widgets(ObjectButtonsPanel, Panel):
bl_label = "Widgets"
@@ -135,6 +136,7 @@ class OBJECT_PT_widgets(ObjectButtonsPanel, Panel):
layout.operator_menu_enum("object.widget_add", "type")
+
class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
bl_label = "Relations"
diff --git a/source/blender/blenkernel/BKE_object_deform.h
b/source/blender/blenkernel/BKE_object_deform.h
index fdcaf0c..e956815 100644
--- a/source/blender/blenkernel/BKE_object_deform.h
+++ b/source/blender/blenkernel/BKE_object_deform.h
@@ -33,12 +33,10 @@
extern "C" {
#endif
-struct bDeformGroup;
-struct bFaceMap;
+struct Object;
struct ID;
-struct ListBase;
struct MDeformVert;
-struct Object;
+struct bDeformGroup;
/* General vgroup operations */
void BKE_object_defgroup_remap_update_users(struct Object *ob, int *map);
@@ -55,6 +53,7 @@ bool BKE_object_defgroup_clear_all(struct Object *ob, const
bool use_selection);
void BKE_object_defgroup_remove(struct Object *ob, struct bDeformGroup
*defgroup);
void BKE_object_defgroup_remove_all(struct Object *ob);
+
/* Select helpers */
enum eVGroupSelect;
bool *BKE_object_defgroup_subset_from_select_type(
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index 0a79f7f..06dbe4b 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1212,12 +1212,11 @@ static void layerDefault_fmap(void *data, int count)
{
int *fmap_num = (int *)data;
int i;
- for (i = 0; i < count; i++)
+ for (i = 0; i < count; i++) {
*fmap_num = -1;
-
+ }
}
-
static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
/* 0: CD_MVERT */
{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 7b1aa67..7587f54 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1528,8 +1528,9 @@ static void write_fmaps(WriteData *wd, ListBase *fbase)
{
bFaceMap *fmap;
- for (fmap=fbase->first; fmap; fmap=fmap->next)
+ for (fmap = fbase->first; fmap; fmap = fmap->next) {
writestruct(wd, DATA, "bFaceMap", 1, fmap);
+ }
}
static void write_modifiers(WriteData *wd, ListBase *modbase)
diff --git a/source/blender/editors/armature/pose_utils.c
b/source/blender/editors/armature/pose_utils.c
index 337e935..20d7369 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -59,7 +59,7 @@
/* *********************************************** */
/* Contents of this File:
*
- * This file mainly contains methods shared between Pose Slide and Pose Lib;
+ * This file contains methods shared between Pose Slide and Pose Lib;
* primarily the functions in question concern Animato <-> Pose
* convenience functions, such as applying/getting pose values
* and/or inserting keyframes for these.
diff --git a/source/blender/editors/object/object_fmap.c
b/source/blender/editors/object/object_fmap.c
index 4886c94..4cc245a 100644
--- a/source/blender/editors/object/object_fmap.c
+++ b/source/blender/editors/object/object_fmap.c
@@ -460,7 +460,7 @@ static int face_map_move_exec(bContext *C, wmOperator *op)
/* iterate through mesh and substitute the indices as necessary */
object_facemap_swap(ob, pos2, pos1);
- ob->actfmap = pos2 +1;
+ ob->actfmap = pos2 + 1;
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
diff --git a/source/blender/editors/object/object_shapekey.c
b/source/blender/editors/object/object_shapekey.c
index 7df4cf5..17141e9 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -499,3 +499,4 @@ void OBJECT_OT_shape_key_move(wmOperatorType *ot)
RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", "");
}
+
diff --git a/source/blender/editors/render/render_internal.c
b/source/blender/editors/render/render_internal.c
index da25cd0..11ba3c4 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1554,8 +1554,8 @@ void render_view3d_draw(RenderEngine *engine, const
bContext *C)
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glPixelZoom(scale_x, scale_y);
glaDrawPixelsAuto(xof, yof, rres.rectx, rres.recty,
- GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST,
- 1.0f, display_buffer);
+ GL_RGBA, GL_UNSIGNED_BYTE,
+ GL_NEAREST, 1.0f, display_buffer);
glPixelZoom(1.0f, 1.0f);
glDisable(GL_BLEND);
diff --git a/source/blender/editors/screen/area.c
b/source/blender/editors/screen/area.c
index 0230146..d42c1b4 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1523,9 +1523,8 @@ void region_toggle_hidden(bContext *C, ARegion *ar, const
bool do_fade)
region_blend_start(C, sa, ar);
}
else {
- if (ar->flag & RGN_FLAG_HIDDEN) {
+ if (ar->flag & RGN_FLAG_HIDDEN)
WM_event_remove_handlers(C, &ar->handlers);
- }
ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
ED_area_tag_redraw(sa);
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 475eec6..7806038 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4117,9 +4117,8 @@ void region_blend_start(bContext *C, ScrArea *sa, ARegion
*ar)
/* blend in, reinitialize regions because it got unhidden */
if (rgi->hidden == 0)
ED_area_initialize(wm, win, sa);
- else {
+ else
WM_event_remove_handlers(C, &ar->handlers);
- }
if (ar->next) {
if (ar->next->alignment & RGN_SPLIT_PREV) {
diff --git a/source/blender/editors/space_api/spacetypes.c
b/source/blender/editors/space_api/spacetypes.c
index c606ae5..cd85141 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -168,7 +168,6 @@ void ED_spacedropwidgets_init(void)
}
}
-
/* called in wm.c */
/* keymap definitions are registered only once per WM initialize, usually on
file read,
* using the keymap the actual areas/regions add the handlers */
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c
b/source/blender/editors/space_sequencer/space_sequencer.c
index 70adde9..97f38ac 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -169,7 +169,7 @@ static SpaceLink *sequencer_new(const bContext *C)
BLI_addtail(&sseq->regionbase, ar);
ar->regiontype = RGN_TYPE_WINDOW;
-
+
/* seq space goes from (0,8) to (0, efra) */
ar->v2d.tot.xmin = 0.0f;
@@ -481,7 +481,7 @@ static void sequencer_main_region_init(wmWindowManager *wm,
ARegion *ar)
/* add drop boxes */
lb = WM_dropboxmap_find("Sequencer", SPACE_SEQ, RGN_TYPE_WINDOW);
-
+
WM_event_add_dropbox_handler(&ar->handlers, lb);
/* no modal keymap here, only operators use this currently */
diff --git a/source/blender/editors/space_view3d/space_view3d.c
b/source/blender/editors/space_view3d/space_view3d.c
index 2808b3d..0de3554 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -404,13 +404,12 @@ static SpaceLink *view3d_new(const bContext *C)
ar->regiontype = RGN_TYPE_WINDOW;
ar->regiondata = MEM_callocN(sizeof(RegionView3D), "region view3d");
-
rv3d = ar->regiondata;
rv3d->viewquat[0] = 1.0f;
rv3d->persp = RV3D_PERSP;
rv3d->view = RV3D_VIEW_USER;
rv3d->dist = 10.0;
-
+
return (SpaceLink *)v3d;
}
@@ -451,7 +450,8 @@ static void view3d_free(SpaceLink *sl)
/* spacetype; init callback */
static void view3d_init(wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
-{
+{
+
}
static SpaceLink *view3d_duplicate(SpaceLink *sl)
@@ -583,6 +583,7 @@ static void view3d_main_region_init(wmWindowManager *wm,
ARegion *ar)
lb = WM_dropboxmap_find("View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW);
WM_event_add_dropbox_handler(&ar->handlers, lb);
+
}
static void view3d_main_region_exit(wmWindowManager *wm, ARegion *ar)
diff --git a/source/blender/editors/space_view3d/view3d_ops.c
b/source/blender/editors/space_view3d/view3d_ops.c
index 0176acc..6e32c0b 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -4,7 +4,7 @@
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,7 @@
* The Original Code is Copyright (C) 2008 Blender Foundation.
* All rights reserved.
*
- *
+ *
* Contributor(s): Blender Foundation
*
* ***** END GPL LICENSE BLOCK *****
@@ -68,9 +68,9 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
char str[FILE_MAX];
-
+
BKE_copybuffer_begin(bmain);
-
+
/* context, selection, could be generalized */
CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
{
@@ -80,7 +80,7 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op)
BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend");
BKE_copybuffer_save(str, op->reports);
-
+
BKE_report(op->reports, RPT_INFO, "Copied selected objects to buffer");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
