[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46715] branches/soc-2011-tomato: svn merge ^/trunk/blender -r46699:46714
Campbell Barton
ideasman42 at gmail.com
Thu May 17 11:34:23 CEST 2012
Revision: 46715
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46715
Author: campbellbarton
Date: 2012-05-17 09:34:22 +0000 (Thu, 17 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46699:46714
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46699
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_ccg.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idprop.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46699
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46714
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-17 09:34:22 UTC (rev 46715)
@@ -1090,7 +1090,11 @@
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+ if(WITH_MINGW64)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+ else()
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+ endif()
set(PCRE_LIBRARIES pcre)
endif()
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py 2012-05-17 09:34:22 UTC (rev 46715)
@@ -93,6 +93,14 @@
row.prop(unit, "use_separate")
+def draw_keyingset_options(data, layout):
+ # NOTE: keep in sync with rna_def_common_keying_flags() in rna_animation.c
+ # These are defined out like this because the standard names are too long
+ layout.prop_enum(data, "bl_options", text="Only Needed", value='INSERTKEY_NEEDED')
+ layout.prop_enum(data, "bl_options", text="Visual Keying", value='INSERTKEY_VISUAL')
+ layout.prop_enum(data, "bl_options", text="XYZ=RGB Coloring", value='INSERTKEY_XYZ_TO_RGB')
+
+
class SCENE_PT_keying_sets(SceneButtonsPanel, Panel):
bl_label = "Keying Sets"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -122,9 +130,9 @@
subcol.operator_context = 'INVOKE_DEFAULT'
subcol.operator("anim.keying_set_export", text="Export to File").filepath = "keyingset.py"
- col = row.column()
+ col = row.column(align=True)
col.label(text="Keyframing Settings:")
- col.prop(ks, "bl_options")
+ draw_keyingset_options(ks, col)
class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel):
@@ -161,23 +169,28 @@
col.template_any_ID(ksp, "id", "id_type")
col.template_path_builder(ksp, "data_path", ksp.id)
- row = layout.row()
+ row = col.row(align=True)
+ row.label(text="Array Target:")
+ row.prop(ksp, "use_entire_array", text="All Items")
+ if ksp.use_entire_array:
+ row.label(text=" ") # padding
+ else:
+ row.prop(ksp, "array_index", text="Index")
- col = row.column()
- col.label(text="Array Target:")
- col.prop(ksp, "use_entire_array")
- if ksp.use_entire_array is False:
- col.prop(ksp, "array_index")
+ layout.separator()
+ row = layout.row()
col = row.column()
col.label(text="F-Curve Grouping:")
- col.prop(ksp, "group_method")
+ col.prop(ksp, "group_method", text="")
if ksp.group_method == 'NAMED':
col.prop(ksp, "group")
+
+ col = row.column(align=True)
+ col.label(text="Keyframing Settings:")
+ draw_keyingset_options(ks, col)
- col.prop(ksp, "bl_options")
-
class SCENE_PT_physics(SceneButtonsPanel, Panel):
bl_label = "Gravity"
COMPAT_ENGINES = {'BLENDER_RENDER'}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_ccg.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_ccg.h 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_ccg.h 2012-05-17 09:34:22 UTC (rev 46715)
@@ -38,11 +38,11 @@
struct CCGSubSurf;
/* Each CCGElem is CCGSubSurf's representation of a subdivided
- vertex. All CCGElems in a particular CCGSubSurf have the same
- layout, but the layout can vary from one CCGSubSurf to another. For
- this reason, CCGElem is presented as an opaque pointer, and
- elements should always be accompanied by a CCGKey, which provides
- the necessary offsets to access components of a CCGElem.
+ * vertex. All CCGElems in a particular CCGSubSurf have the same
+ * layout, but the layout can vary from one CCGSubSurf to another. For
+ * this reason, CCGElem is presented as an opaque pointer, and
+ * elements should always be accompanied by a CCGKey, which provides
+ * the necessary offsets to access components of a CCGElem.
*/
typedef struct CCGElem CCGElem;
@@ -50,7 +50,7 @@
int level;
/* number of bytes in each element (one float per layer, plus
- three floats for normals if enabled) */
+ * three floats for normals if enabled) */
int elem_size;
/* number of elements along each side of grid */
@@ -61,11 +61,11 @@
int grid_bytes;
/* currently always the last three floats, unless normals are
- disabled */
+ * disabled */
int normal_offset;
/* offset in bytes of mask value; only valid if 'has_mask' is
- true */
+ * true */
int mask_offset;
int num_layers;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h 2012-05-17 09:34:22 UTC (rev 46715)
@@ -261,8 +261,8 @@
void CustomData_bmesh_set_n(struct CustomData *data, void *block, int type, int n,
void *source);
-/*sets the data of the block at physical layer n. no real type checking
- *is performed.
+/* sets the data of the block at physical layer n. no real type checking
+ * is performed.
*/
void CustomData_bmesh_set_layer_n(struct CustomData *data, void *block, int n,
void *source);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-17 09:34:22 UTC (rev 46715)
@@ -3127,7 +3127,7 @@
key->num_layers = ss->meshIFC.numLayers;
/* if normals are present, always the last three floats of an
- element */
+ * element */
if (key->has_normals)
key->normal_offset = key->elem_size - sizeof(float) * 3;
else
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-05-17 09:34:22 UTC (rev 46715)
@@ -522,7 +522,7 @@
glNormal3sv(no); \
} \
glVertex3fv(mvert[index].co); \
-}
+} (void)0
if (cddm->pbvh && cddm->pbvh_draw) {
if (dm->numTessFaceData) {
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c 2012-05-17 09:17:39 UTC (rev 46714)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c 2012-05-17 09:34:22 UTC (rev 46715)
@@ -92,7 +92,7 @@
/* ********** cloth engine ******* */
/* Prototypes for internal functions.
-*/
+ */
static void cloth_to_object (Object *ob, ClothModifierData *clmd, float (*vertexCos)[3]);
static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm );
static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *dm, float framenr, int first);
@@ -101,10 +101,10 @@
/******************************************************************************
-*
-* External interface called by modifier.c clothModifier functions.
-*
-******************************************************************************/
+ *
+ * External interface called by modifier.c clothModifier functions.
+ *
+ ******************************************************************************/
/**
* cloth_init - creates a new cloth simulation.
*
@@ -145,8 +145,8 @@
clmd->coll_parms->selfepsilon = 0.75;
/* These defaults are copied from softbody.c's
- * softbody_calc_forces() function.
- */
+ * softbody_calc_forces() function.
+ */
clmd->sim_parms->eff_force_scale = 1000.0;
clmd->sim_parms->eff_wind_scale = 250.0;
@@ -476,7 +476,7 @@
/************************************************
* clothModifier_do - main simulation function
-************************************************/
+ ************************************************/
void clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, DerivedMesh *dm, float (*vertexCos)[3])
{
PointCache *cache;
@@ -729,10 +729,10 @@
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list