[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46916] branches/smoke2: Bring branch into sync with turnk again, some files were missed in past merges
Daniel Genrich
daniel.genrich at gmx.net
Wed May 23 01:44:17 CEST 2012
Revision: 46916
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46916
Author: genscher
Date: 2012-05-22 23:44:17 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Bring branch into sync with turnk again, some files were missed in past merges
Modified Paths:
--------------
branches/smoke2/intern/audaspace/intern/AUD_Reference.h
branches/smoke2/intern/cycles/blender/blender_object.cpp
branches/smoke2/intern/cycles/device/device_cuda.cpp
branches/smoke2/intern/cycles/kernel/kernel_passes.h
branches/smoke2/intern/cycles/kernel/kernel_path.h
branches/smoke2/intern/cycles/render/mesh.cpp
branches/smoke2/intern/cycles/render/nodes.cpp
branches/smoke2/intern/cycles/render/object.cpp
branches/smoke2/intern/elbeem/intern/solver_init.cpp
branches/smoke2/intern/guardedalloc/cpp/mallocn.cpp
branches/smoke2/source/blender/avi/intern/endian.h
branches/smoke2/source/blender/blenkernel/BKE_displist.h
branches/smoke2/source/blender/blenkernel/BKE_ocean.h
branches/smoke2/source/blender/blenkernel/BKE_utildefines.h
branches/smoke2/source/blender/blenkernel/intern/anim.c
branches/smoke2/source/blender/blenkernel/intern/brush.c
branches/smoke2/source/blender/blenkernel/intern/camera.c
branches/smoke2/source/blender/blenkernel/intern/constraint.c
branches/smoke2/source/blender/blenkernel/intern/customdata.c
branches/smoke2/source/blender/blenkernel/intern/displist.c
branches/smoke2/source/blender/blenkernel/intern/group.c
branches/smoke2/source/blender/blenkernel/intern/image.c
branches/smoke2/source/blender/blenkernel/intern/mesh.c
branches/smoke2/source/blender/blenkernel/intern/screen.c
branches/smoke2/source/blender/blenkernel/intern/softbody.c
branches/smoke2/source/blender/blenkernel/intern/text.c
branches/smoke2/source/blender/blenlib/BLI_bitmap.h
branches/smoke2/source/blender/blenlib/BLI_memarena.h
branches/smoke2/source/blender/blenlib/PIL_time.h
branches/smoke2/source/blender/blenlib/intern/pbvh.c
branches/smoke2/source/blender/blenlib/intern/voxel.c
branches/smoke2/source/blender/blenlib/intern/winstuff.c
branches/smoke2/source/blender/blenpluginapi/floatpatch.h
branches/smoke2/source/blender/bmesh/intern/bmesh_interp.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mods.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators.c
branches/smoke2/source/blender/bmesh/intern/bmesh_private.h
branches/smoke2/source/blender/bmesh/operators/bmo_bevel.c
branches/smoke2/source/blender/bmesh/operators/bmo_create.c
branches/smoke2/source/blender/bmesh/operators/bmo_extrude.c
branches/smoke2/source/blender/bmesh/operators/bmo_primitive.c
branches/smoke2/source/blender/bmesh/operators/bmo_removedoubles.c
branches/smoke2/source/blender/bmesh/operators/bmo_subdivide.c
branches/smoke2/source/blender/bmesh/operators/bmo_triangulate.c
branches/smoke2/source/blender/bmesh/operators/bmo_wireframe.c
branches/smoke2/source/blender/collada/AnimationImporter.cpp
branches/smoke2/source/blender/collada/AnimationImporter.h
branches/smoke2/source/blender/collada/CameraExporter.cpp
branches/smoke2/source/blender/collada/DocumentImporter.cpp
branches/smoke2/source/blender/collada/MeshImporter.cpp
branches/smoke2/source/blender/editors/armature/poseobject.c
branches/smoke2/source/blender/editors/include/ED_particle.h
branches/smoke2/source/blender/editors/include/ED_physics.h
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/physics/particle_edit.c
branches/smoke2/source/blender/editors/render/render_preview.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_vertex.c
branches/smoke2/source/blender/editors/sculpt_paint/sculpt.c
branches/smoke2/source/blender/editors/sound/sound_ops.c
branches/smoke2/source/blender/editors/space_clip/clip_buttons.c
branches/smoke2/source/blender/editors/space_clip/clip_editor.c
branches/smoke2/source/blender/editors/space_clip/clip_graph_draw.c
branches/smoke2/source/blender/editors/space_clip/clip_graph_ops.c
branches/smoke2/source/blender/editors/space_clip/clip_ops.c
branches/smoke2/source/blender/editors/space_clip/clip_utils.c
branches/smoke2/source/blender/editors/space_info/info_stats.c
branches/smoke2/source/blender/editors/space_node/drawnode.c
branches/smoke2/source/blender/editors/space_node/node_draw.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/smoke2/source/blender/editors/space_text/space_text.c
branches/smoke2/source/blender/editors/space_view3d/drawanimviz.c
branches/smoke2/source/blender/editors/space_view3d/drawobject.c
branches/smoke2/source/blender/editors/space_view3d/view3d_edit.c
branches/smoke2/source/blender/editors/space_view3d/view3d_ops.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform_conversions.c
branches/smoke2/source/blender/editors/transform/transform_generics.c
branches/smoke2/source/blender/editors/uvedit/uvedit_ops.c
branches/smoke2/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/smoke2/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/smoke2/source/blender/gpu/CMakeLists.txt
branches/smoke2/source/blender/gpu/intern/gpu_material.c
branches/smoke2/source/blender/imbuf/intern/dds/ColorBlock.h
branches/smoke2/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/smoke2/source/blender/imbuf/intern/moviecache.c
branches/smoke2/source/blender/imbuf/intern/tiff.c
branches/smoke2/source/blender/makesdna/DNA_ID.h
branches/smoke2/source/blender/makesdna/DNA_boid_types.h
branches/smoke2/source/blender/makesdna/DNA_image_types.h
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/makesrna/intern/rna_scene.c
branches/smoke2/source/blender/makesrna/intern/rna_screen.c
branches/smoke2/source/blender/makesrna/intern/rna_test.c
branches/smoke2/source/blender/modifiers/intern/MOD_boolean_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_cloth.c
branches/smoke2/source/blender/modifiers/intern/MOD_collision.c
branches/smoke2/source/blender/modifiers/intern/MOD_hook.c
branches/smoke2/source/blender/modifiers/intern/MOD_mask.c
branches/smoke2/source/blender/modifiers/intern/MOD_mirror.c
branches/smoke2/source/blender/modifiers/intern/MOD_solidify.c
branches/smoke2/source/blender/modifiers/intern/MOD_warp.c
branches/smoke2/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types.h
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/smoke2/source/blender/python/mathutils/mathutils.h
branches/smoke2/source/blender/python/mathutils/mathutils_Euler.h
branches/smoke2/source/blender/python/mathutils/mathutils_Quaternion.h
branches/smoke2/source/blender/python/mathutils/mathutils_geometry.h
branches/smoke2/source/blender/render/intern/include/occlusion.h
branches/smoke2/source/blender/render/intern/source/convertblender.c
branches/smoke2/source/blender/render/intern/source/envmap.c
branches/smoke2/source/blender/render/intern/source/external_engine.c
branches/smoke2/source/blender/render/intern/source/occlusion.c
branches/smoke2/source/blender/render/intern/source/pipeline.c
branches/smoke2/source/blender/render/intern/source/render_result.c
branches/smoke2/source/blender/render/intern/source/sunsky.c
branches/smoke2/source/blender/render/intern/source/voxeldata.c
branches/smoke2/source/blender/windowmanager/intern/wm_keymap.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
branches/smoke2/source/gameengine/Converter/KX_ConvertProperties.h
branches/smoke2/source/gameengine/Ketsji/KX_PythonSeq.h
branches/smoke2/source/gameengine/Rasterizer/RAS_IRasterizer.h
Modified: branches/smoke2/intern/audaspace/intern/AUD_Reference.h
===================================================================
--- branches/smoke2/intern/audaspace/intern/AUD_Reference.h 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/audaspace/intern/AUD_Reference.h 2012-05-22 23:44:17 UTC (rev 46916)
@@ -180,9 +180,9 @@
}
else
{
- pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+ }
}
- }
/**
* Assigns an AUD_Reference to this object.
Modified: branches/smoke2/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/smoke2/intern/cycles/blender/blender_object.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/blender/blender_object.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -194,7 +194,7 @@
/* light is handled separately */
if(object_is_light(b_ob)) {
if(!motion)
- sync_light(b_parent, b_index, b_ob, tfm);
+ sync_light(b_parent, b_index, b_ob, tfm);
return;
}
@@ -233,7 +233,7 @@
object_updated = true;
bool use_holdout = (layer_flag & render_layer.holdout_layer) != 0;
-
+
/* mesh sync */
object->mesh = sync_mesh(b_ob, object_updated);
@@ -276,11 +276,11 @@
uint scene_layer = render_layer.scene_layer;
if(!motion) {
- /* prepare for sync */
- light_map.pre_sync();
- mesh_map.pre_sync();
- object_map.pre_sync();
- mesh_synced.clear();
+ /* prepare for sync */
+ light_map.pre_sync();
+ mesh_map.pre_sync();
+ object_map.pre_sync();
+ mesh_synced.clear();
}
/* object loop */
@@ -336,18 +336,18 @@
}
if(!motion) {
- sync_background_light();
+ sync_background_light();
- /* handle removed data and modified pointers */
- if(light_map.post_sync())
- scene->light_manager->tag_update(scene);
- if(mesh_map.post_sync())
- scene->mesh_manager->tag_update(scene);
- if(object_map.post_sync())
- scene->object_manager->tag_update(scene);
- mesh_synced.clear();
+ /* handle removed data and modified pointers */
+ if(light_map.post_sync())
+ scene->light_manager->tag_update(scene);
+ if(mesh_map.post_sync())
+ scene->mesh_manager->tag_update(scene);
+ if(object_map.post_sync())
+ scene->object_manager->tag_update(scene);
+ mesh_synced.clear();
+ }
}
-}
void BlenderSync::sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override)
{
Modified: branches/smoke2/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/smoke2/intern/cycles/device/device_cuda.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/device/device_cuda.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -696,13 +696,13 @@
CUresult result = cuGraphicsGLRegisterBuffer(&pmem.cuPBOresource, pmem.cuPBO, CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE);
if(!cuda_error(result)) {
- cuda_pop_context();
+ cuda_pop_context();
- mem.device_pointer = pmem.cuTexId;
- pixel_mem_map[mem.device_pointer] = pmem;
+ mem.device_pointer = pmem.cuTexId;
+ pixel_mem_map[mem.device_pointer] = pmem;
- return;
- }
+ return;
+ }
else {
/* failed to register buffer, fallback to no interop */
glDeleteBuffers(1, &pmem.cuPBO);
Modified: branches/smoke2/intern/cycles/kernel/kernel_passes.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_passes.h 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/kernel/kernel_passes.h 2012-05-22 23:44:17 UTC (rev 46916)
@@ -79,8 +79,8 @@
float4 speed = triangle_motion_vector(kg, sd);
kernel_write_pass_float4(buffer + kernel_data.film.pass_motion, sample, speed);
kernel_write_pass_float(buffer + kernel_data.film.pass_motion_weight, sample, 1.0f);
+ }
}
- }
if(flag & (PASS_DIFFUSE_INDIRECT|PASS_DIFFUSE_COLOR|PASS_DIFFUSE_DIRECT))
L->color_diffuse += shader_bsdf_diffuse(kg, sd)*throughput;
Modified: branches/smoke2/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_path.h 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/kernel/kernel_path.h 2012-05-22 23:44:17 UTC (rev 46916)
@@ -281,7 +281,7 @@
if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) && (state.flag & PATH_RAY_CAMERA)) {
if(kernel_data.background.transparent) {
float3 holdout_weight;
-
+
if(sd.flag & SD_HOLDOUT_MASK)
holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
else
@@ -289,7 +289,7 @@
/* any throughput is ok, should all be identical here */
L_transparent += average(holdout_weight*throughput);
- }
+ }
if(sd.flag & SD_HOLDOUT_MASK)
break;
Modified: branches/smoke2/intern/cycles/render/mesh.cpp
===================================================================
--- branches/smoke2/intern/cycles/render/mesh.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/render/mesh.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -525,7 +525,7 @@
for(size_t k = 0; k < size; k++)
attr_float3[req.offset+k] = float3_to_float4(data[k]);
- }
+ }
/* mesh vertex/triangle index is global, not per object, so we sneak
a correction for that in here */
Modified: branches/smoke2/intern/cycles/render/nodes.cpp
===================================================================
--- branches/smoke2/intern/cycles/render/nodes.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/render/nodes.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -1690,7 +1690,7 @@
if(!out->links.empty()) {
compiler.stack_assign(out);
compiler.add_node(NODE_LIGHT_PATH, NODE_LP_ray_length, out->stack_offset);
-}
+ }
}
Modified: branches/smoke2/intern/cycles/render/object.cpp
===================================================================
--- branches/smoke2/intern/cycles/render/object.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/cycles/render/object.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -68,7 +68,7 @@
transform_motion_interpolate(&ttfm, &decomp, t);
bounds.grow(mbounds.transformed(&ttfm));
-}
+ }
}
else
bounds = mbounds.transformed(&tfm);
@@ -310,16 +310,16 @@
foreach(Object *object, scene->objects) {
if(mesh_users[object->mesh] == 1) {
if(!(motion_blur && object->use_motion)) {
- if(!object->mesh->transform_applied) {
- object->apply_transform();
- object->mesh->transform_applied = true;
+ if(!object->mesh->transform_applied) {
+ object->apply_transform();
+ object->mesh->transform_applied = true;
- if(progress.get_cancel()) return;
+ if(progress.get_cancel()) return;
+ }
+ }
}
}
}
- }
-}
void ObjectManager::tag_update(Scene *scene)
{
Modified: branches/smoke2/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/smoke2/intern/elbeem/intern/solver_init.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/elbeem/intern/solver_init.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -1405,8 +1405,6 @@
for(int OId=0; OId<numobjs; OId++) {
ntlGeometryObject *obj = (*mpGiObjects)[OId];
bool skip = false;
-
-
if(obj->getGeoInitId() != mLbmInitId) skip=true;
if( (!staticInit) && (!obj->getIsAnimated()) ) skip=true;
if( ( staticInit) && ( obj->getIsAnimated()) ) skip=true;
@@ -1657,7 +1655,7 @@
const LbmFloat usqr = (vel[0]*vel[0]+vel[1]*vel[1]+vel[2]*vel[2])*1.5;
USQRMAXCHECK(usqr,vel[0],vel[1],vel[2], mMaxVlen, mMxvx,mMxvy,mMxvz);
//errMsg("LbmFsgrSolver::initMovingObstacles","id"<<OId<<" "<<obj->getName()<<" inflow "<<staticInit<<" "<<mMOIVertices.size() );
-
+
for(size_t n=0; n<mMOIVertices.size(); n++) {
POS2GRID_CHECK(mMOIVertices,n);
// TODO - also reinit interface cells !?
@@ -1695,7 +1693,6 @@
else if(ntype&CFMbndOutflow){
const LbmFloat iniRho = 0.0;
-
for(size_t n=0; n<mMOIVertices.size(); n++) {
POS2GRID_CHECK(mMOIVertices,n);
// FIXME check fluid/inter cells for non-static!?
@@ -1792,7 +1789,7 @@
int numobjs = (int)(mpGiObjects->size());
for(int o=0; o<numobjs; o++) {
ntlGeometryObject *obj = (*mpGiObjects)[o];
- // debMsgStd("LbmFsgrSolver::initMovingObstacles",DM_MSG," obj "<<obj->getName()<<" type "<<obj->getGeoInitType()<<" anim"<<obj->getIsAnimated()<<" "<<obj->getVolumeInit() ,9);
+ //debMsgStd("LbmFsgrSolver::initMovingObstacles",DM_MSG," obj "<<obj->getName()<<" type "<<obj->getGeoInitType()<<" anim"<<obj->getIsAnimated()<<" "<<obj->getVolumeInit() ,9);
if(
((obj->getGeoInitType()&FGI_ALLBOUNDS) && (obj->getIsAnimated())) ||
(obj->getVolumeInit()&VOLUMEINIT_SHELL) ) {
@@ -1857,16 +1854,16 @@
if(inside) {
pObj = (*mpGiObjects)[OId];
switch( pObj->getGeoInitType() ){
- case FGI_MBNDINFLOW:
- if(! pObj->getIsAnimated()) {
+ case FGI_MBNDINFLOW:
+ if(! pObj->getIsAnimated() ) {
rhomass = 1.0;
ntype = CFFluid | CFMbndInflow;
} else {
ntype = CFInvalid;
- }
+ }
break;
case FGI_MBNDOUTFLOW:
- if(! pObj->getIsAnimated()) {
+ if(! pObj->getIsAnimated() ) {
rhomass = 0.0;
ntype = CFEmpty|CFMbndOutflow;
} else {
Modified: branches/smoke2/intern/guardedalloc/cpp/mallocn.cpp
===================================================================
--- branches/smoke2/intern/guardedalloc/cpp/mallocn.cpp 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/intern/guardedalloc/cpp/mallocn.cpp 2012-05-22 23:44:17 UTC (rev 46916)
@@ -43,5 +43,5 @@
{
/* delete NULL is valid in c++ */
if(p)
- MEM_freeN(p);
+ MEM_freeN(p);
}
Modified: branches/smoke2/source/blender/avi/intern/endian.h
===================================================================
--- branches/smoke2/source/blender/avi/intern/endian.h 2012-05-22 23:26:17 UTC (rev 46915)
+++ branches/smoke2/source/blender/avi/intern/endian.h 2012-05-22 23:44:17 UTC (rev 46916)
@@ -46,7 +46,7 @@
#define AVI_INDEXE 6
#define AVI_MJPEGU 7
-void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int type);
+void awrite(AviMovie *movie, void *datain, int block, int size, FILE *fp, int type);
#endif
Modified: branches/smoke2/source/blender/blenkernel/BKE_displist.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list