Revision: 22372
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22372
Author: jaguarandi
Date: 2009-08-11 15:26:31 +0200 (Tue, 11 Aug 2009)
Log Message:
-----------
svn merge -r 22364:22371
https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_anim_api.h
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/makesrna.c
Added Paths:
-----------
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels_edit.c
Removed Paths:
-------------
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels.c
Modified: branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp
2009-08-11 13:07:24 UTC (rev 22371)
+++ branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp
2009-08-11 13:26:31 UTC (rev 22372)
@@ -132,10 +132,12 @@
void AUD_exit()
{
- assert(AUD_device);
- delete AUD_device;
- AUD_device = NULL;
- AUD_3ddevice = NULL;
+ if(AUD_device)
+ {
+ delete AUD_device;
+ AUD_device = NULL;
+ AUD_3ddevice = NULL;
+ }
}
void AUD_lock()
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.cpp
2009-08-11 13:07:24 UTC (rev 22371)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.cpp
2009-08-11 13:26:31 UTC (rev 22372)
@@ -289,8 +289,9 @@
#endif
#ifdef GHOST_DEBUG
+ m_eventPrinter = new GHOST_EventPrinter();
if (m_eventManager) {
- m_eventManager->addConsumer(&m_eventPrinter);
+ m_eventManager->addConsumer(m_eventPrinter);
}
#endif // GHOST_DEBUG
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.h
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.h
2009-08-11 13:07:24 UTC (rev 22371)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_System.h
2009-08-11 13:26:31 UTC (rev 22372)
@@ -335,7 +335,7 @@
/** Prints all the events. */
#ifdef GHOST_DEBUG
- GHOST_EventPrinter m_eventPrinter;
+ GHOST_EventPrinter* m_eventPrinter;
#endif // GHOST_DEBUG
/** Settings of the display before the display went fullscreen. */
Modified: branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c
2009-08-11 13:07:24 UTC (rev 22371)
+++ branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c
2009-08-11 13:26:31 UTC (rev 22372)
@@ -662,10 +662,11 @@
smd->domain->omega = 1.0;
smd->domain->alpha = -0.001;
smd->domain->beta = 0.1;
- smd->domain->flags = 0;
+ smd->domain->flags = 0; // MOD_SMOKE_DISSOLVE_INV;
smd->domain->strength = 2.0;
smd->domain->noise = MOD_SMOKE_NOISEWAVE;
smd->domain->visibility = 1;
+ // smd->domain->diss_speed = 50;
// init 3dview buffer
smd->domain->tvox = NULL;
@@ -759,9 +760,11 @@
{
GroupObject *go = NULL;
Base *base = NULL;
- int cnt_domain = 0;
tstart();
+
+ // if(sds->flags & MOD_SMOKE_DISSOLVE)
+ // smoke_dissolve(sds->fluid, sds->diss_speed,
sds->flags & MOD_SMOKE_DISSOLVE_LOG, sds->flags & MOD_SMOKE_DISSOLVE_INV);
/* reset view for new frame */
if(sds->viewsettings < MOD_SMOKE_VIEW_USEBIG)
@@ -769,34 +772,13 @@
else
sds->viewsettings = MOD_SMOKE_VIEW_USEBIG;
- /* check for 2nd domain, if not there -> no groups are
necessary */
- for(base = scene->base.first; base; base= base->next)
- {
- Object *ob1= base->object;
-
- if(ob1 && ob1 != ob)
- {
- ModifierData *tmd =
modifiers_findByType(ob1, eModifierType_Smoke);
-
- if(tmd && tmd->mode &
(eModifierMode_Realtime | eModifierMode_Render))
- {
- SmokeModifierData *tsmd =
(SmokeModifierData *)tmd;
-
- if((tsmd->type &
MOD_SMOKE_TYPE_DOMAIN))
- {
- cnt_domain++;
- }
- }
- }
- }
-
// do flows and fluids
- if(sds->fluid_group || !cnt_domain)
+ if(1)
{
Object *otherobj = NULL;
ModifierData *md = NULL;
- if(cnt_domain && !sds->fluid_group) // we use
groups since we have 2 domains
+ if(sds->fluid_group) // we use groups since we
have 2 domains
go = sds->fluid_group->gobject.first;
else
base = scene->base.first;
@@ -805,7 +787,7 @@
{
otherobj = NULL;
- if(cnt_domain && !sds->fluid_group)
+ if(sds->fluid_group)
{
if(go->ob)
otherobj = go->ob;
@@ -815,7 +797,7 @@
if(!otherobj)
{
- if(cnt_domain &&
!sds->fluid_group)
+ if(sds->fluid_group)
go = go->next;
else
base= base->next;
@@ -942,7 +924,7 @@
}
}
- if(cnt_domain && !sds->fluid_group)
+ if(sds->fluid_group)
go = go->next;
else
base= base->next;
@@ -967,12 +949,12 @@
*/
// do collisions
- if(sds->coll_group || !cnt_domain)
+ if(1)
{
Object *otherobj = NULL;
ModifierData *md = NULL;
- if(cnt_domain && !sds->coll_group) // we use
groups since we have 2 domains
+ if(sds->coll_group) // we use groups since we
have 2 domains
go = sds->coll_group->gobject.first;
else
base = scene->base.first;
@@ -981,7 +963,7 @@
{
otherobj = NULL;
- if(cnt_domain && !sds->coll_group)
+ if(sds->coll_group)
{
if(go->ob)
otherobj = go->ob;
@@ -991,7 +973,7 @@
if(!otherobj)
{
- if(cnt_domain &&
!sds->coll_group)
+ if(sds->coll_group)
go = go->next;
else
base= base->next;
@@ -1065,7 +1047,7 @@
}
}
- if(cnt_domain && !sds->coll_group)
+ if(sds->coll_group)
go = go->next;
else
base= base->next;
Deleted:
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels.c
===================================================================
---
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels.c
2009-08-11 13:07:24 UTC (rev 22371)
+++
branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels.c
2009-08-11 13:26:31 UTC (rev 22372)
@@ -1,2020 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Joshua Leung
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_arithb.h"
-
-#include "DNA_listBase.h"
-#include "DNA_anim_types.h"
-#include "DNA_action_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_object_types.h"
-#include "DNA_particle_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_space_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_key_types.h"
-#include "DNA_lamp_types.h"
-#include "DNA_material_types.h"
-#include "DNA_meta_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_gpencil_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_world_types.h"
-
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "BKE_depsgraph.h"
-#include "BKE_fcurve.h"
-#include "BKE_key.h"
-#include "BKE_material.h"
-#include "BKE_object.h"
-#include "BKE_context.h"
-#include "BKE_utildefines.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "ED_anim_api.h"
-#include "ED_keyframes_edit.h" // XXX move the select modes out of there!
-#include "ED_screen.h"
-#include "ED_space_api.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-/* **************************************************************************
*/
-/* CHANNELS API */
-
-/* -------------------------- Exposed API -----------------------------------
*/
-
-/* Set the given animation-channel as the active one for the active context */
-void ANIM_set_active_channel (bAnimContext *ac, void *data, short datatype,
int filter, void *channel_data, short channel_type)
-{
- ListBase anim_data = {NULL, NULL};
- bAnimListElem *ale;
-
- /* try to build list of filtered items */
- ANIM_animdata_filter(ac, &anim_data, filter, data, datatype);
- if (anim_data.first == NULL)
- return;
-
- /* only clear the 'active' flag for the channels of the same type */
- for (ale= anim_data.first; ale; ale= ale->next) {
- /* skip if types don't match */
- if (channel_type != ale->type)
- continue;
-
- /* flag to set depends on type */
- switch (ale->type) {
- case ANIMTYPE_GROUP:
- {
- bActionGroup *agrp= (bActionGroup *)ale->data;
-
- ACHANNEL_SET_FLAG(agrp, ACHANNEL_SETFLAG_CLEAR,
AGRP_ACTIVE);
- }
- break;
- case ANIMTYPE_FCURVE:
- {
- FCurve *fcu= (FCurve *)ale->data;
-
- ACHANNEL_SET_FLAG(fcu, ACHANNEL_SETFLAG_CLEAR,
FCURVE_ACTIVE);
- }
- break;
- case ANIMTYPE_NLATRACK:
- {
- NlaTrack *nlt= (NlaTrack *)ale->data;
-
- ACHANNEL_SET_FLAG(nlt, ACHANNEL_SETFLAG_CLEAR,
NLATRACK_ACTIVE);
- }
- break;
- }
- }
-
- /* set active flag */
- if (channel_data != NULL) {
- switch (channel_type) {
- case ANIMTYPE_GROUP:
- {
- bActionGroup *agrp= (bActionGroup
*)channel_data;
- agrp->flag |= AGRP_ACTIVE;
- }
- break;
- case ANIMTYPE_FCURVE:
- {
- FCurve *fcu= (FCurve *)channel_data;
- fcu->flag |= FCURVE_ACTIVE;
- }
- break;
- case ANIMTYPE_NLATRACK:
- {
- NlaTrack *nlt= (NlaTrack *)channel_data;
- nlt->flag |= NLATRACK_ACTIVE;
- }
- break;
- }
- }
-
- /* clean up */
- BLI_freelistN(&anim_data);
-}
-
-/* Deselect all animation channels
- * - data: pointer to datatype, as contained in bAnimContext
- * - datatype: the type of data that 'data' represents (eAnimCont_Types)
- * - test: check if deselecting instead of selecting
- * - sel: eAnimChannels_SetFlag;
- */
-void ANIM_deselect_anim_channels (void *data, short datatype, short test,
short sel)
-{
- ListBase anim_data = {NULL, NULL};
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
