This happened to be a bigger rabbit hole to hell than it originally seemed, and there are higher priority design tasks to be handled (at this point high priority design task is more important than high priority bug fix). After talking to Brecht the decision was made to revert to the known isolated issue, which will allow everyone in the studio work same as prior to last Friday. The remaining bits will be worked on after all the design tasks are out of the way. This commit reverts:4cdb4b9532Fix T64161: Crashing using undo and multiple windows064273a4aeSound: Port more cases to be a part of dependency graph2e582f8ab5Sound: Fix access wrong dependency graph5fc49d9c91Sound: add stubs to build without audaspacec68c81a870Sound: Make sure spin lock is initialized for new sound datablocksc02534469aSound: Delay creating sound scene handle for until is needed9f681bea68Fix T64144: Crash when displaying audio waveforms in VSE2f79286453Cleanup: unused varsbed8ad6f95Fix crash in background rendering after recent sound changes773691310fFix T64143: Crash when scrubbing in the graph editor888852055cSound: Fix for being unable to jump to a frame during playback with A/V sync6ab7b38464Sound: More fixes for access of original scene35db119545Sound: Fix access original scene during playback211c4fd2e9Depsgraph: Make comment about evaluation more obviousc5fe16e121Sound: Make sound handles only be in evaluated datablocksb4e1e0946bDepsgraph: Preserve sound and audio pointers through copy-on-write4eedf784b0Depsgraph: Store original sequencer strip pointer6990ef151cSound: Move evaluation to dependency graphd02da8de23Sound: Delay opening handlers for until really needed3369b82891Depsgraph: Add scene audio componente8f10d6475Depsgraph: Tag sequencer for update on changes6e4b7a6e4dDepsgraph: Initial work to cover sequencer17447ac5a6Depsgraph: Make sound ID part of the graph
129 lines
4.9 KiB
C++
129 lines
4.9 KiB
C++
/*
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*/
|
|
|
|
#ifndef __BKE_MATERIAL_H__
|
|
#define __BKE_MATERIAL_H__
|
|
|
|
/** \file
|
|
* \ingroup bke
|
|
* \brief General operations, lookup, etc. for materials.
|
|
*/
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct ID;
|
|
struct Main;
|
|
struct Material;
|
|
struct Object;
|
|
struct Scene;
|
|
|
|
/* materials */
|
|
|
|
void init_def_material(void);
|
|
void BKE_material_free(struct Material *ma);
|
|
void test_object_materials(struct Main *bmain, struct Object *ob, struct ID *id);
|
|
void test_all_objects_materials(struct Main *bmain, struct ID *id);
|
|
void BKE_material_resize_object(struct Main *bmain,
|
|
struct Object *ob,
|
|
const short totcol,
|
|
bool do_id_user);
|
|
void BKE_material_init(struct Material *ma);
|
|
void BKE_material_remap_object(struct Object *ob, const unsigned int *remap);
|
|
void BKE_material_remap_object_calc(struct Object *ob_dst,
|
|
struct Object *ob_src,
|
|
short *remap_src_to_dst);
|
|
struct Material *BKE_material_add(struct Main *bmain, const char *name);
|
|
struct Material *BKE_material_add_gpencil(struct Main *bmain, const char *name);
|
|
void BKE_material_copy_data(struct Main *bmain,
|
|
struct Material *ma_dst,
|
|
const struct Material *ma_src,
|
|
const int flag);
|
|
struct Material *BKE_material_copy(struct Main *bmain, const struct Material *ma);
|
|
struct Material *BKE_material_localize(struct Material *ma);
|
|
struct Material *give_node_material(struct Material *ma); /* returns node material or self */
|
|
void BKE_material_make_local(struct Main *bmain, struct Material *ma, const bool lib_local);
|
|
void BKE_material_init_gpencil_settings(struct Material *ma);
|
|
|
|
/* UNUSED */
|
|
// void automatname(struct Material *);
|
|
|
|
/* material slots */
|
|
|
|
struct Material ***give_matarar(struct Object *ob);
|
|
short *give_totcolp(struct Object *ob);
|
|
struct Material ***give_matarar_id(struct ID *id); /* same but for ID's */
|
|
short *give_totcolp_id(struct ID *id);
|
|
|
|
enum {
|
|
/* use existing link option */
|
|
BKE_MAT_ASSIGN_EXISTING,
|
|
BKE_MAT_ASSIGN_USERPREF,
|
|
BKE_MAT_ASSIGN_OBDATA,
|
|
BKE_MAT_ASSIGN_OBJECT,
|
|
};
|
|
|
|
struct Material **give_current_material_p(struct Object *ob, short act);
|
|
struct Material *give_current_material(struct Object *ob, short act);
|
|
void assign_material_id(struct Main *bmain, struct ID *id, struct Material *ma, short act);
|
|
void assign_material(
|
|
struct Main *bmain, struct Object *ob, struct Material *ma, short act, int assign_type);
|
|
void assign_matarar(struct Main *bmain, struct Object *ob, struct Material ***matar, short totcol);
|
|
|
|
short BKE_object_material_slot_find_index(struct Object *ob, struct Material *ma);
|
|
bool BKE_object_material_slot_add(struct Main *bmain, struct Object *ob);
|
|
bool BKE_object_material_slot_remove(struct Main *bmain, struct Object *ob);
|
|
|
|
struct MaterialGPencilStyle *BKE_material_gpencil_settings_get(struct Object *ob, short act);
|
|
|
|
void BKE_texpaint_slot_refresh_cache(struct Scene *scene, struct Material *ma);
|
|
void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob);
|
|
|
|
/* rna api */
|
|
void BKE_material_resize_id(struct Main *bmain, struct ID *id, short totcol, bool do_id_user);
|
|
void BKE_material_append_id(struct Main *bmain, struct ID *id, struct Material *ma);
|
|
struct Material *BKE_material_pop_id(struct Main *bmain,
|
|
struct ID *id,
|
|
int index,
|
|
bool update_data); /* index is an int because of RNA */
|
|
void BKE_material_clear_id(struct Main *bmain, struct ID *id, bool update_data);
|
|
/* rendering */
|
|
|
|
void ramp_blend(int type, float r_col[3], const float fac, const float col[3]);
|
|
|
|
/* copy/paste */
|
|
void clear_matcopybuf(void);
|
|
void free_matcopybuf(void);
|
|
void copy_matcopybuf(struct Main *bmain, struct Material *ma);
|
|
void paste_matcopybuf(struct Main *bmain, struct Material *ma);
|
|
|
|
/* Evaluation. */
|
|
|
|
struct Depsgraph;
|
|
|
|
void BKE_material_eval(struct Depsgraph *depsgraph, struct Material *material);
|
|
|
|
extern struct Material defmaterial;
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|