[Bf-blender-cvs] [33ed259] soc-2014-shapekey: Cleanup
Bastien Montagne
noreply at git.blender.org
Sun Oct 19 19:20:20 CEST 2014
Commit: 33ed25904421929e19951c2bf7c9fb3d17c6d3f7
Author: Bastien Montagne
Date: Sun Oct 19 18:21:00 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rB33ed25904421929e19951c2bf7c9fb3d17c6d3f7
Cleanup
Mostly, revert unrelevant changes from master, with a few style cleanup as well here and there.
No change in behavior expected!
===================================================================
M release/scripts/startup/bl_ui/properties_data_mesh.py
M source/blender/blenkernel/BKE_crazyspace.h
M source/blender/blenkernel/BKE_editmesh.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/intern/key.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/intern/bmesh_pe.c
M source/blender/bmesh/intern/bmesh_pe.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/editmesh_utils.c
M source/blender/editors/object/object_shapekey.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/makesdna/DNA_key_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_key.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/creator.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 98ea59e..0f98a57 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -62,7 +62,7 @@ class MESH_MT_shape_key_specials(Menu):
class MESH_UL_vgroups(UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
- # assert(isinstance(item, bpy.types.VertexGroup)
+ # assert(isinstance(item, bpy.types.VertexGroup))
vgroup = item
if self.layout_type in {'DEFAULT', 'COMPACT'}:
layout.prop(vgroup, "name", text="", emboss=False, icon_value=icon)
@@ -75,17 +75,14 @@ class MESH_UL_vgroups(UIList):
def draw_shape_value(ob, kb, layout, emboss=False, text=""):
key = ob.data.shape_keys
- if (ob.mode == 'EDIT'):
- if (key.mix_from_animation):
- layout.prop(kb, "value", emboss=emboss, text=text)
- else:
- layout.prop(kb, "edit_mix_value", emboss=emboss, text='Temp ' + text)
- else:
+ if ob.mode != 'EDIT' or key.mix_from_animation:
layout.prop(kb, "value", emboss=emboss, text=text)
+ else:
+ layout.prop(kb, "edit_mix_value", emboss=emboss, text='Temp ' + text)
class MESH_UL_shape_keys(UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
- # assert(isinstance(item, bpy.types.ShapeKey)
+ # assert(isinstance(item, bpy.types.ShapeKey))
obj = active_data
key = data
key_block = item
@@ -107,7 +104,7 @@ class MESH_UL_shape_keys(UIList):
class MESH_UL_uvmaps_vcols(UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
- # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer))
+ # assert(isinstance(item, (bpy.types.MeshTexturePolyLayer, bpy.types.MeshLoopColorLayer)))
if self.layout_type in {'DEFAULT', 'COMPACT'}:
layout.prop(item, "name", text="", emboss=False, icon_value=icon)
icon = 'RESTRICT_RENDER_OFF' if item.active_render else 'RESTRICT_RENDER_ON'
@@ -231,6 +228,7 @@ class DATA_PT_vertex_groups(MeshButtonsPanel, Panel):
layout.prop(context.tool_settings, "vertex_group_weight", text="Weight")
+
class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
bl_label = "Shape Keys"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -249,14 +247,13 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
kb = ob.active_shape_key
ts = context.scene.tool_settings
- in_editmode = ob.mode == 'EDIT'
+ is_editmode = (ob.mode == 'EDIT')
row = layout.row()
rows = 2
if kb:
rows = 7
-
row.template_list("MESH_UL_shape_keys", "", key, "key_blocks", ob, "active_shape_key_index", rows=rows)
col = row.column()
@@ -277,7 +274,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
split = layout.split(percentage=0.4)
row = split.row()
- row.enabled = not in_editmode
+ row.enabled = not is_editmode
row.prop(key, "use_relative")
row = split.row()
if ob.mode == 'ED IT':
@@ -287,7 +284,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
sub.label() # XXX, for alignment only
subsub = sub.row(align=True)
- if in_editmode:
+ if is_editmode:
if ob.type == 'MESH':
subsub.prop(key, "mix_from_animation", text="")
subsub.prop(ob, "use_shape_key_edit_mode", text="")
@@ -308,13 +305,13 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
split = layout.split()
col = split.column(align=True)
- col.active = ob.mode != 'EDIT'
+ col.active = not is_editmode
col.label(text="Range:")
col.prop(kb, "slider_min", text="Min")
col.prop(kb, "slider_max", text="Max")
col = split.column(align=True)
- col.active = ob.mode != 'EDIT'
+ col.active = not is_editmode
col.label(text="Blend:")
col.prop_search(kb, "vertex_group", ob, "vertex_groups", text="")
col.prop_search(kb, "relative_key", key, "key_blocks", text="")
@@ -322,7 +319,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
else:
layout.prop(kb, "interpolation")
row = layout.column()
- row.active = ob.mode != 'EDIT'
+ row.active = not is_editmode
row.prop(key, "eval_time")
row.prop(key, "slurph")
diff --git a/source/blender/blenkernel/BKE_crazyspace.h b/source/blender/blenkernel/BKE_crazyspace.h
index 0fd10b1..4801e2a 100644
--- a/source/blender/blenkernel/BKE_crazyspace.h
+++ b/source/blender/blenkernel/BKE_crazyspace.h
@@ -51,18 +51,18 @@ int BKE_sculpt_get_first_deform_matrices(struct Scene *scene, struct Object *ob,
void BKE_crazyspace_build_sculpt(struct Scene *scene, struct Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]);
/* Returns true if the object's derived cage vertex indexes can be assumed to be in sync to
-* the editdata (base) vertex indexes */
+ * the editdata (base) vertex indexes */
bool BKE_crazyspace_cageindexes_in_sync(struct Object *ob);
/* Maps editmesh vertex indexes to derivedmesh cage vertex indexes and returns the map.
-* If returns NULL, it means that mapping failed for some reason (modifier failing to set CD_ORIGINDEX, etc).
-* It is the caller's responsibility to free the returned array! */
+ * If returns NULL, it means that mapping failed for some reason (modifier failing to set CD_ORIGINDEX, etc).
+ * It is the caller's responsibility to free the returned array! */
int *BKE_crazyspace_map_em_to_cage(struct BMEditMesh *em, struct DerivedMesh *cage_dm);
/* Calculates editmesh active element selection center in global space on derived cage
* (used in calculating visual manipulator and transform constraint centers) */
void BKE_crazyspace_cage_active_sel_center(struct BMEditSelection *active_sel, struct DerivedMesh *cage,
- int *derived_index_map, float *cent);
+ int *derived_index_map, float *cent);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index 4a67b4b..e7044a5 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -106,10 +106,10 @@ void BKE_editmesh_color_free(BMEditMesh *em);
void BKE_editmesh_color_ensure(BMEditMesh *em, const char htype);
/* calculates a topology-dependent hash to detect if topology has been modified later */
-void BKE_editmesh_topochange_calc(BMEditMesh *em);
+void BKE_editmesh_topochange_calc(BMEditMesh *em);
/* checks if the topology has changed since last call to BKE_editmesh_syncdata_calc. Does not recalc! */
-bool BKE_editmesh_topo_has_changed(BMEditMesh *em);
+bool BKE_editmesh_topo_has_changed(BMEditMesh *em);
/* editderivedmesh.c */
/* should really be defined in editmesh.c, but they use 'EditDerivedBMesh' */
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index e77427a..720e49f 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -32,77 +32,77 @@
* \since March 2001
* \author nzc
*/
-
-typedef struct Object Object;
-typedef struct Key Key;
-typedef struct KeyBlock KeyBlock;
-typedef struct ID ID;
-typedef struct ListBase ListBase;
-typedef struct Curve Curve;
-typedef struct Scene Scene;
-typedef struct Lattice Lattice;
-typedef struct Mesh Mesh;
-typedef struct WeightsArrayCache WeightsArrayCache;
-typedef struct BMEditMesh BMEditMesh;
-typedef struct ScratchKeyBlock ScratchKeyBlock;
+struct Key;
+struct KeyBlock;
+struct ID;
+struct ListBase;
+struct Curve;
+struct Object;
+struct Scene;
+struct Lattice;
+struct Mesh;
+struct WeightsArrayCache;
+struct BMEditMesh;
+struct ScratchKeyBlock;
/* Kernel prototypes */
#ifdef __cplusplus
extern "C" {
#endif
-void BKE_key_free(Key *sc);
-void BKE_key_free_nolib(Key *key);
-Key *BKE_key_add(ID *id);
-Key *BKE_key_copy(Key *key);
-Key *BKE_key_copy_nolib(Key *key);
-void BKE_key_make_local(Key *key);
+void BKE_key_free(struct Key *sc);
+void BKE_key_free_nolib(struct Key *key);
+struct Key *BKE_key_add(struct ID *id);
+struct Key *BKE_key_copy(struct Key *key);
+struct Key *BKE_key_copy_nolib(struct Key *key);
+void BKE_key_make_local(struct Key *key);
/* overwrites data in 'to' with data in 'from', frees old 'to' data.
* does not touch any library data, animation data and ID and from */
-void BKE_key_overwrite_data(Key *from, Key *to);
-void BKE_key_sort(Key *key);
+void BKE_key_overwrite_data(struct Key *from, struct Key *to);
+void BKE_key_sort(struct Key *key);
void key_curve_position_weights(float t, float data[4], int type);
void key_curve_tangent_weights(float t, float data[4], int type);
void key_curve_normal_weights(float t, float data[4], int type);
-float *BKE_key_evaluate_object_ex(Scene *scene, Object *ob, int *r_totelem,
+float *BKE_key_evaluate_object_ex(struct Scene *scene, struct Object *ob, int *r_totelem,
float *arr, size_t arr_size);
-float *BKE_key_evaluate_object(Scene *scene, Object *ob, int *r_totelem);
+float *BKE_key_evaluate_object(struct Scene *scene, struct Object *ob, int *r_totelem);
-Key *BKE_key_from_object(Object *ob);
-KeyBlock *BKE_keyblock_from_object(Object *ob);
-KeyBlock *BKE_keyblock_from_object_reference(Object *ob);
+struct Key *BKE_key_from_object(struct Object *ob);
+struct KeyBlock *BKE_keyblock_from_object(struct Object *ob);
+str
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list