[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46469] branches/soc-2011-tomato: Merging r46456 through r46468 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed May 9 17:37:56 CEST 2012
Revision: 46469
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46469
Author: nazgul
Date: 2012-05-09 15:37:56 +0000 (Wed, 09 May 2012)
Log Message:
-----------
Merging r46456 through r46468 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46456
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46468
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/space_console/console_intern.h
branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/util/crazyspace.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2011-tomato/source/blender/imbuf/intern/png.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/python/SConscript
branches/soc-2011-tomato/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-tomato/source/blender/render/intern/include/texture.h
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Added Paths:
-----------
branches/soc-2011-tomato/source/tools/check_style_c.py
Removed Paths:
-------------
branches/soc-2011-tomato/extern/libmv/patches/mingw_w64_support.patch
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-46455
+ /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-46468
Deleted: branches/soc-2011-tomato/extern/libmv/patches/mingw_w64_support.patch
===================================================================
--- branches/soc-2011-tomato/extern/libmv/patches/mingw_w64_support.patch 2012-05-09 15:21:45 UTC (rev 46468)
+++ branches/soc-2011-tomato/extern/libmv/patches/mingw_w64_support.patch 2012-05-09 15:37:56 UTC (rev 46469)
@@ -1,58 +0,0 @@
-Index: bundle.sh
-===================================================================
---- bundle.sh (revision 45912)
-+++ bundle.sh (working copy)
-@@ -248,7 +248,7 @@
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
--if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- incs += ' ./third_party/msinttypes'
-Index: libmv/numeric/numeric.h
-===================================================================
---- libmv/numeric/numeric.h (revision 45912)
-+++ libmv/numeric/numeric.h (working copy)
-@@ -33,7 +33,7 @@
- #include <Eigen/QR>
- #include <Eigen/SVD>
-
--#if _WIN32 || __APPLE__ || __FreeBSD__
-+#if (defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)) && !defined(__MINGW64__)
- void static sincos (double x, double *sinx, double *cosx) {
- *sinx = sin(x);
- *cosx = cos(x);
-Index: third_party/glog/src/windows/port.cc
-===================================================================
---- third_party/glog/src/windows/port.cc (revision 45912)
-+++ third_party/glog/src/windows/port.cc (working copy)
-@@ -55,6 +55,8 @@
- return _vsnprintf(str, size-1, format, ap);
- }
-
-+// MinGW64 defines
-+#ifndef __MINGW64__
- int snprintf(char *str, size_t size, const char *format, ...) {
- va_list ap;
- va_start(ap, format);
-@@ -62,3 +64,4 @@
- va_end(ap);
- return r;
- }
-+#endif
-Index: third_party/glog/src/windows/port.h
-===================================================================
---- third_party/glog/src/windows/port.h (revision 45912)
-+++ third_party/glog/src/windows/port.h (working copy)
-@@ -120,7 +120,9 @@
- #define DEFAULT_TEMPLATE_ROOTDIR ".."
-
- // ----------------------------------- SYSTEM/PROCESS
-+#ifndef __MINGW64__
- typedef int pid_t;
-+#endif
- #define getpid _getpid
-
- // ----------------------------------- THREADS
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py 2012-05-09 15:21:45 UTC (rev 46468)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py 2012-05-09 15:37:56 UTC (rev 46469)
@@ -42,6 +42,7 @@
layout = self.layout
layout.operator("console.clear")
+ layout.operator("console.clear_line")
layout.operator("console.copy")
layout.operator("console.paste")
layout.menu("CONSOLE_MT_language")
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h 2012-05-09 15:21:45 UTC (rev 46468)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h 2012-05-09 15:37:56 UTC (rev 46469)
@@ -109,6 +109,12 @@
typedef void (*IDWalkFunc)(void *userData, struct Object *ob, struct ID **idpoin);
typedef void (*TexWalkFunc)(void *userData, struct Object *ob, struct ModifierData *md, const char *propname);
+typedef enum ModifierApplyFlag {
+ MOD_APPLY_RENDER = 1 << 0, /* Render time. */
+ MOD_APPLY_USECACHE = 1 << 1, /* Last modifier in stack. */
+} ModifierApplyFlag;
+
+
typedef struct ModifierTypeInfo {
/* The user visible name for this modifier */
char name[32];
@@ -142,7 +148,7 @@
void (*deformVerts)(struct ModifierData *md, struct Object *ob,
struct DerivedMesh *derivedData,
float (*vertexCos)[3], int numVerts,
- int useRenderParams, int isFinalCalc);
+ ModifierApplyFlag flag);
/* Like deformMatricesEM but called from object mode (for supporting modifiers in sculpt mode) */
void (*deformMatrices)(
@@ -187,7 +193,7 @@
struct DerivedMesh *(*applyModifier)(
struct ModifierData *md, struct Object *ob,
struct DerivedMesh *derivedData,
- int useRenderParams, int isFinalCalc);
+ ModifierApplyFlag flag);
/* Like applyModifier but called during editmode (for supporting
* modifiers).
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-09 15:21:45 UTC (rev 46468)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-09 15:37:56 UTC (rev 46469)
@@ -814,7 +814,7 @@
int numVerts;
float (*deformedVerts)[3] = mesh_getVertexCos(me, &numVerts);
- mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, 0, 0);
+ mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, 0);
dm = mesh_create_derived(me, ob, deformedVerts);
if (build_shapekey_layers)
@@ -828,7 +828,7 @@
if (build_shapekey_layers)
add_shapekey_layers(tdm, me, ob);
- dm = mti->applyModifier(md, ob, tdm, 0, 0);
+ dm = mti->applyModifier(md, ob, tdm, 0);
if (tdm != dm) tdm->release(tdm);
}
@@ -1383,6 +1383,13 @@
/* XXX Same as above... For now, only weights preview in WPaint mode. */
const int do_mod_wmcol = do_init_wmcol;
+ ModifierApplyFlag app_flags = useRenderParams ? MOD_APPLY_RENDER : 0;
+ ModifierApplyFlag deform_app_flags = app_flags;
+ if (useCache)
+ app_flags |= MOD_APPLY_USECACHE;
+ if (useDeform)
+ deform_app_flags |= MOD_APPLY_USECACHE;
+
if (mmd && !mmd->sculptlvl)
has_multires = 0;
@@ -1434,7 +1441,7 @@
if (!deformedVerts)
deformedVerts = mesh_getVertexCos(me, &numVerts);
- mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, useRenderParams, useDeform);
+ mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, deform_app_flags);
}
else {
break;
@@ -1547,7 +1554,7 @@
}
}
- mti->deformVerts(md, ob, dm, deformedVerts, numVerts, useRenderParams, useDeform);
+ mti->deformVerts(md, ob, dm, deformedVerts, numVerts, deform_app_flags);
}
else {
DerivedMesh *ndm;
@@ -1622,7 +1629,7 @@
}
}
- ndm = mti->applyModifier(md, ob, dm, useRenderParams, useCache);
+ ndm = mti->applyModifier(md, ob, dm, app_flags);
if (ndm) {
/* if the modifier returned a new dm, release the old one */
@@ -1645,7 +1652,7 @@
nextmask &= ~CD_MASK_ORCO;
DM_set_only_copy(orcodm, nextmask | CD_MASK_ORIGINDEX);
- ndm = mti->applyModifier(md, ob, orcodm, useRenderParams, 0);
+ ndm = mti->applyModifier(md, ob, orcodm, app_flags & ~MOD_APPLY_USECACHE);
if (ndm) {
/* if the modifier returned a new dm, release the old one */
@@ -1661,7 +1668,7 @@
nextmask &= ~CD_MASK_CLOTH_ORCO;
DM_set_only_copy(clothorcodm, nextmask | CD_MASK_ORIGINDEX);
- ndm = mti->applyModifier(md, ob, clothorcodm, useRenderParams, 0);
+ ndm = mti->applyModifier(md, ob, clothorcodm, app_flags & ~MOD_APPLY_USECACHE);
if (ndm) {
/* if the modifier returned a new dm, release the old one */
@@ -1928,7 +1935,8 @@
if (mti->deformVertsEM)
mti->deformVertsEM(md, ob, em, dm, deformedVerts, numVerts);
- else mti->deformVerts(md, ob, dm, deformedVerts, numVerts, 0, 0);
+ else
+ mti->deformVerts(md, ob, dm, deformedVerts, numVerts, 0);
}
else {
DerivedMesh *ndm;
@@ -1971,7 +1979,7 @@
if (mti->applyModifierEM)
ndm = mti->applyModifierEM(md, ob, em, orcodm);
else
- ndm = mti->applyModifier(md, ob, orcodm, 0, 0);
+ ndm = mti->applyModifier(md, ob, orcodm, 0);
if (ndm) {
/* if the modifier returned a new dm, release the old one */
@@ -1995,7 +2003,7 @@
if (mti->applyModifierEM)
ndm = mti->applyModifierEM(md, ob, em, dm);
else
- ndm = mti->applyModifier(md, ob, dm, 0, 0);
+ ndm = mti->applyModifier(md, ob, dm, 0);
if (ndm) {
if (dm && dm != ndm)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c 2012-05-09 15:21:45 UTC (rev 46468)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c 2012-05-09 15:37:56 UTC (rev 46469)
@@ -1301,14 +1301,12 @@
* if the texture didn't give an RGB value, copy the intensity across
*/
if (hasrgb & TEX_RGB)
- texres.tin = (0.35f * texres.tr + 0.45f *
- texres.tg + 0.2f * texres.tb);
+ texres.tin = rgb_to_grayscale(&texres.tr);
- texres.tin = texres.tin * 255.0f;
- ((char *)texcache)[(iy * side + ix) * 4] = (char)texres.tin;
- ((char *)texcache)[(iy * side + ix) * 4 + 1] = (char)texres.tin;
- ((char *)texcache)[(iy * side + ix) * 4 + 2] = (char)texres.tin;
- ((char *)texcache)[(iy * side + ix) * 4 + 3] = (char)texres.tin;
+ ((char *)texcache)[(iy * side + ix) * 4] =
+ ((char *)texcache)[(iy * side + ix) * 4 + 1] =
+ ((char *)texcache)[(iy * side + ix) * 4 + 2] =
+ ((char *)texcache)[(iy * side + ix) * 4 + 3] = (char)(texres.tin * 255.0f);
}
}
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list