[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43034] branches/vgroup_modifiers: Merged from trunk (-r43015:43033)
Bastien Montagne
montagne29 at wanadoo.fr
Sat Dec 31 12:38:04 CET 2011
Revision: 43034
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43034
Author: mont29
Date: 2011-12-31 11:37:54 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Merged from trunk (-r43015:43033)
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43015
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/SConstruct
branches/vgroup_modifiers/build_files/scons/tools/btools.py
branches/vgroup_modifiers/intern/CMakeLists.txt
branches/vgroup_modifiers/intern/SConscript
branches/vgroup_modifiers/intern/dualcon/intern/Projections.h
branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
branches/vgroup_modifiers/source/blender/blenloader/BLO_sys_types.h
branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
branches/vgroup_modifiers/source/blender/editors/space_file/filesel.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_snap.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/vgroup_modifiers/source/blender/modifiers/CMakeLists.txt
branches/vgroup_modifiers/source/blender/modifiers/SConscript
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_remesh.c
branches/vgroup_modifiers/source/blender/render/intern/source/shadeoutput.c
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.cpp
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43015
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43033
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/CMakeLists.txt 2011-12-31 11:37:54 UTC (rev 43034)
@@ -169,6 +169,7 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
@@ -1570,6 +1571,7 @@
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_BOOLEAN)
+ info_cfg_option(WITH_MOD_REMESH)
info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
Modified: branches/vgroup_modifiers/SConstruct
===================================================================
--- branches/vgroup_modifiers/SConstruct 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/SConstruct 2011-12-31 11:37:54 UTC (rev 43034)
@@ -264,6 +264,7 @@
target_env_defs['WITH_BF_OCEANSIM'] = False
target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
+ target_env_defs['WITH_BF_REMESH'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
Modified: branches/vgroup_modifiers/build_files/scons/tools/btools.py
===================================================================
--- branches/vgroup_modifiers/build_files/scons/tools/btools.py 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/build_files/scons/tools/btools.py 2011-12-31 11:37:54 UTC (rev 43034)
@@ -152,6 +152,7 @@
'WITH_BF_FLUID',
'WITH_BF_DECIMATE',
'WITH_BF_BOOLEAN',
+ 'WITH_BF_REMESH',
'WITH_BF_OCEANSIM',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
@@ -261,6 +262,7 @@
(BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
(BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
(BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
+ (BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
(BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
Modified: branches/vgroup_modifiers/intern/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/intern/CMakeLists.txt 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/intern/CMakeLists.txt 2011-12-31 11:37:54 UTC (rev 43034)
@@ -31,12 +31,15 @@
add_subdirectory(iksolver)
add_subdirectory(opennl)
add_subdirectory(mikktspace)
-add_subdirectory(dualcon)
if(WITH_AUDASPACE)
add_subdirectory(audaspace)
endif()
+if(WITH_MOD_REMESH)
+ add_subdirectory(dualcon)
+endif()
+
if(WITH_MOD_FLUID)
add_subdirectory(elbeem)
endif()
Modified: branches/vgroup_modifiers/intern/SConscript
===================================================================
--- branches/vgroup_modifiers/intern/SConscript 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/intern/SConscript 2011-12-31 11:37:54 UTC (rev 43034)
@@ -9,7 +9,6 @@
'container/SConscript',
'memutil/SConscript/',
'decimation/SConscript',
- 'dualcon/SConscript',
'iksolver/SConscript',
'itasc/SConscript',
'boolop/SConscript',
@@ -23,6 +22,9 @@
# perhaps get rid of intern/csg?
NEW_CSG='false'
+if env ['WITH_BF_REMESH']:
+ SConscript(['dualcon/SConscript'])
+
if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
Modified: branches/vgroup_modifiers/intern/dualcon/intern/Projections.h
===================================================================
--- branches/vgroup_modifiers/intern/dualcon/intern/Projections.h 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/intern/dualcon/intern/Projections.h 2011-12-31 11:37:54 UTC (rev 43034)
@@ -29,9 +29,10 @@
#define CONTAINS_INDEX
#define GRID_DIMENSION 20
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#if defined(_WIN32) && !defined(__MINGW32__)
#define LONG __int64
#else
+#include <stdint.h>
#define LONG int64_t
#endif
#define UCHAR unsigned char
Modified: branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h 2011-12-31 11:37:54 UTC (rev 43034)
@@ -94,7 +94,9 @@
#include <stdint.h>
/* XXX */
-#ifndef uint64_t
+
+#ifndef UINT64_MAX
+# define UINT64_MAX 18446744073709551615
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
Modified: branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py 2011-12-31 11:37:54 UTC (rev 43034)
@@ -16,7 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8 compliant>
+# <pep8-80 compliant>
+
import bpy
from bpy.types import Panel, Header, Menu
@@ -209,12 +210,9 @@
col = layout.column(align=True)
- if tracking_object.is_camera:
- solve_text = "Camera Motion"
- else:
- solve_text = "Object Motion"
-
- col.operator("clip.solve_camera", text=solve_text)
+ col.operator("clip.solve_camera",
+ text="Camera Motion" if tracking_object.is_camera
+ else "Object Motion")
col.operator("clip.clear_solution")
col = layout.column(align=True)
@@ -379,11 +377,12 @@
def draw(self, context):
layout = self.layout
sc = context.space_data
- clip = context.space_data.clip
+ clip = sc.clip
tracking = clip.tracking
row = layout.row()
- row.template_list(tracking, "objects", tracking, "active_object_index", rows=3)
+ row.template_list(tracking, "objects",
+ tracking, "active_object_index", rows=3)
sub = row.column(align=True)
@@ -472,7 +471,7 @@
def poll(cls, context):
sc = context.space_data
- return sc.mode in ['TRACKING', 'DISTORTION'] and sc.clip
+ return sc.mode in {'TRACKING', 'DISTORTION'} and sc.clip
def draw(self, context):
layout = self.layout
Modified: branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c 2011-12-31 11:37:54 UTC (rev 43034)
@@ -2564,7 +2564,9 @@
bConstraint *con;
for (con = obt->constraints.first; con; con=con->next) {
bConstraintTypeInfo *cti= constraint_get_typeinfo(con);
- if(ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER)) {
+ if(ELEM3(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER,
+ CONSTRAINT_TYPE_OBJECTSOLVER))
+ {
obt->recalc |= OB_RECALC_OB;
break;
}
Modified: branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c 2011-12-31 11:08:04 UTC (rev 43033)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c 2011-12-31 11:37:54 UTC (rev 43034)
@@ -510,8 +510,6 @@
scene->r.subframe = subframe;
}
-#define BRUSH_USES_VELOCITY (1<<0)
-
static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene)
{
Base *base = NULL;
@@ -2288,7 +2286,7 @@
tPoint->quad = (isInside == 2) ? 1 : 0; /* quad or tri part*/
/* save vertex indexes */
- tPoint->v1 = mface[i].v1; /* (isInside == 2) ? mface[i].v1 : mface[i].v1; */ /* same! */
+ tPoint->v1 = mface[i].v1;
tPoint->v2 = (isInside == 2) ? mface[i].v3 : mface[i].v2;
tPoint->v3 = (isInside == 2) ? mface[i].v4 : mface[i].v3;
@@ -2368,7 +2366,7 @@
tPoint->quad = tempPoints[ind].quad; // quad or tri
/* save vertex indexes */
- tPoint->v1 = (tPoint->quad) ? mface[i].v1 : mface[i].v1;
+ tPoint->v1 = mface[i].v1;
tPoint->v2 = (tPoint->quad) ? mface[i].v3 : mface[i].v2;
tPoint->v3 = (tPoint->quad) ? mface[i].v4 : mface[i].v3;
@@ -2398,10 +2396,8 @@
}
}
- /* If any effect enabled, create surface effect / wet layer
- * neighbour lists. Processes possibly moving data. */
- if (surface_usesAdjData(surface)) {
-
+ /* Generate surface adjacency data. */
+ {
int i, cursor=0;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list