[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48430] branches/soc-2012-swiss_cheese: Merged w/ Trunk: r48395-r48429
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sat Jun 30 12:38:37 CEST 2012
Revision: 48430
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48430
Author: jwilkins
Date: 2012-06-30 10:38:36 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Merged w/ Trunk: r48395-r48429
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48395
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48429
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/mesh.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_global.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_image.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/effect.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_node.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_transform.h
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_modifier.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.h
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_snap.c
branches/soc-2012-swiss_cheese/source/blender/gpu/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_draw.h
branches/soc-2012-swiss_cheese/source/blender/gpu/SConscript
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-swiss_cheese/source/creator/creator.c
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/CMakeLists.txt
Property Changed:
----------------
branches/soc-2012-swiss_cheese/
Property changes on: branches/soc-2012-swiss_cheese
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46806-48394
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46806-48425,48428-48429
Modified: branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/mesh.py 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/mesh.py 2012-06-30 10:38:36 UTC (rev 48430)
@@ -58,13 +58,10 @@
vcos = (v.co.to_tuple(5) for v in mesh.vertices)
for i, co in enumerate(vcos):
- if co[0] > 0.0:
+ if co[0] >= 0.0:
mirror_gt[co] = i
- elif co[0] < 0.0:
+ if co[0] <= 0.0:
mirror_lt[co] = i
- else:
- mirror_gt[co] = i
- mirror_lt[co] = i
#for i, v in enumerate(mesh.vertices):
vmap = {}
@@ -97,14 +94,13 @@
puvsel[i] = (False not in
(uv.select for uv in uv_loops[lstart:lend]))
# Vert idx of the poly.
- vidxs[i] = tuple(sorted(l.vertex_index
- for l in loops[lstart:lend]))
+ vidxs[i] = tuple(l.vertex_index for l in loops[lstart:lend])
# As we have no poly.center yet...
pcents[i] = tuple(map(lambda x: x / p.loop_total,
map(sum, zip(*(verts[idx].co
for idx in vidxs[i])))))
# Preparing next step finding matching polys.
- mirror_pm[vidxs[i]] = i
+ mirror_pm[tuple(sorted(vidxs[i]))] = i
for i in range(nbr_polys):
# Find matching mirror poly.
Modified: branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_node.py 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_node.py 2012-06-30 10:38:36 UTC (rev 48430)
@@ -90,6 +90,9 @@
# Snap
row = layout.row(align=True)
row.prop(toolsettings, "use_snap", text="")
+ row.prop(toolsettings, "snap_node_element", text="", icon_only=True)
+ if toolsettings.snap_node_element != 'INCREMENT':
+ row.prop(toolsettings, "snap_target", text="")
layout.template_running_jobs()
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_global.h 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_global.h 2012-06-30 10:38:36 UTC (rev 48430)
@@ -119,7 +119,8 @@
G_DEBUG_FFMPEG = (1 << 1),
G_DEBUG_PYTHON = (1 << 2), /* extra python info */
G_DEBUG_EVENTS = (1 << 3), /* input/window/screen events */
- G_DEBUG_WM = (1 << 4) /* operator, undo */
+ G_DEBUG_WM = (1 << 4), /* operator, undo */
+ G_DEBUG_JOBS = (1 << 5) /* jobs time profiling */
};
#define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM)
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_image.h 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_image.h 2012-06-30 10:38:36 UTC (rev 48430)
@@ -191,7 +191,7 @@
void BKE_image_merge(struct Image *dest, struct Image *source);
/* scale the image */
-void BKE_image_scale(struct Image *image, int width, int height);
+int BKE_image_scale(struct Image *image, int width, int height);
/* check if texture has alpha (depth=32) */
int BKE_image_has_alpha(struct Image *image);
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/dynamicpaint.c 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/dynamicpaint.c 2012-06-30 10:38:36 UTC (rev 48430)
@@ -33,6 +33,7 @@
#include "BLI_utildefines.h"
#include "DNA_anim_types.h"
+#include "DNA_armature_types.h"
#include "DNA_constraint_types.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_group_types.h" /*GroupObject*/
@@ -46,6 +47,7 @@
#include "DNA_texture_types.h"
#include "BKE_animsys.h"
+#include "BKE_armature.h"
#include "BKE_bvhutils.h" /* bvh tree */
#include "BKE_blender.h"
#include "BKE_cdderivedmesh.h"
@@ -528,11 +530,6 @@
}
}
}
- /* for curve following objects, parented curve has to be updated too */
- if (ob->type == OB_CURVE) {
- Curve *cu = ob->data;
- BKE_animsys_evaluate_animdata(scene, &cu->id, cu->adt, frame, ADT_RECALC_ANIM);
- }
/* was originally OB_RECALC_ALL - TODO - which flags are really needed??? */
ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
@@ -547,6 +544,18 @@
else
BKE_object_where_is_calc_time(scene, ob, frame);
+ /* for curve following objects, parented curve has to be updated too */
+ if (ob->type == OB_CURVE) {
+ Curve *cu = ob->data;
+ BKE_animsys_evaluate_animdata(scene, &cu->id, cu->adt, frame, ADT_RECALC_ANIM);
+ }
+ /* and armatures... */
+ if (ob->type == OB_ARMATURE) {
+ bArmature *arm = ob->data;
+ BKE_animsys_evaluate_animdata(scene, &arm->id, arm->adt, frame, ADT_RECALC_ANIM);
+ BKE_pose_where_is(scene, ob);
+ }
+
return 0;
}
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/effect.c 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/effect.c 2012-06-30 10:38:36 UTC (rev 48430)
@@ -789,6 +789,12 @@
multitex_ext(eff->pd->tex, tex_co, NULL, NULL, 0, result+3);
if (mode == PFIELD_TEX_GRAD || !hasrgb) { /* if we don't have rgb fall back to grad */
+ /* generate intensity if texture only has rgb value */
+ if (hasrgb & TEX_RGB) {
+ int i;
+ for (i=0; i<4; i++)
+ result[i].tin = (1.0f / 3.0f) * (result[i].tr + result[i].tg + result[i].tb);
+ }
force[0] = (result[0].tin - result[1].tin) * strength;
force[1] = (result[0].tin - result[2].tin) * strength;
force[2] = (result[0].tin - result[3].tin) * strength;
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c 2012-06-30 10:38:36 UTC (rev 48430)
@@ -514,17 +514,21 @@
}
/* note, we could be clever and scale all imbuf's but since some are mipmaps its not so simple */
-void BKE_image_scale(Image *image, int width, int height)
+int BKE_image_scale(Image *image, int width, int height)
{
ImBuf *ibuf;
void *lock;
ibuf = BKE_image_acquire_ibuf(image, NULL, &lock);
- IMB_scaleImBuf(ibuf, width, height);
- ibuf->userflags |= IB_BITMAPDIRTY;
+ if (ibuf) {
+ IMB_scaleImBuf(ibuf, width, height);
+ ibuf->userflags |= IB_BITMAPDIRTY;
+ }
BKE_image_release_ibuf(image, lock);
+
+ return (ibuf != NULL);
}
Image *BKE_image_load(const char *filepath)
Modified: branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mods.c 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mods.c 2012-06-30 10:38:36 UTC (rev 48430)
@@ -354,12 +354,12 @@
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
do {
- BM_loop_interp_from_face(bm, l_iter, of, FALSE, TRUE);
+ BM_loop_interp_multires(bm, l_iter, of);
} while ((l_iter = l_iter->next) != l_first);
l_iter = l_first = BM_FACE_FIRST_LOOP(nf);
do {
- BM_loop_interp_from_face(bm, l_iter, of, FALSE, TRUE);
+ BM_loop_interp_multires(bm, l_iter, of);
} while ((l_iter = l_iter->next) != l_first);
BM_face_kill(bm, of);
Modified: branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api.h 2012-06-30 10:31:25 UTC (rev 48429)
+++ branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api.h 2012-06-30 10:38:36 UTC (rev 48430)
@@ -116,7 +116,7 @@
* for when your defining an operator with BMOpDefine.*/
typedef struct BMOpSlot {
- int slottype;
+ int slot_type;
int len;
int flag;
int index; /* index within slot array */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list