blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

DynTopo: 

* Fixed failed patch reversion from a while ago
* Also tweaked a few comments.
This commit is contained in:
Joseph Eagar 2021-05-27 12:15:49 -07:00
parent 3ca3098ed7
commit 1f19a86150
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 7ce14793f983f857b9bf6b54f8b5cadd42e3a8a6
Subproject commit e25068ef471c6d6cd5ee64a2eef9b7d672c57029

15
source/blender/draw/intern/draw_cache.c
View File

@ -35,9 +35,9 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BKE_customdata.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_customdata.h"
#include "GPU_batch.h"
#include "GPU_batch_utils.h"
@ -243,7 +243,7 @@ static void UNUSED_FUNCTION(add_fancy_edge)(GPUVertBuf *vbo,
GPU_vertbuf_attr_set(vbo, pos_id, (*v_idx)++, co2);
}
#if 0 /* UNUSED */
#if 0 /* UNUSED */
static void add_lat_lon_vert(GPUVertBuf *vbo,
uint pos_id,
uint nor_id,
@ -485,16 +485,19 @@ static void sphere_lat_lon_vert(GPUVertBuf *vbo, int *v_ofs, float lat, float lo
(*v_ofs)++;
}
void DRW_make_cdlayer_attr_aliases(GPUVertFormat *format, char *base_name, CustomData *data, CustomDataLayer *cl)
void DRW_make_cdlayer_attr_aliases(GPUVertFormat *format,
char *base_name,
CustomData *data,
CustomDataLayer *cl)
{
char attr_name[32], attr_safe_name[GPU_MAX_SAFE_ATTR_NAME];
const char *layer_name = cl->name;
int i = (int) (cl - data->typemap[cl->type]);
int i = (int)(cl - data->typemap[cl->type]);
GPU_vertformat_safe_attr_name(layer_name, attr_safe_name, GPU_MAX_SAFE_ATTR_NAME);
/* UV layer name. */
/* Attribute layer name. */
BLI_snprintf(attr_name, sizeof(attr_name), "%s%s", base_name, attr_safe_name);
GPU_vertformat_alias_add(format, attr_name);
@ -512,7 +515,7 @@ void DRW_make_cdlayer_attr_aliases(GPUVertFormat *format, char *base_name, Custo
GPU_vertformat_alias_add(format, attr_name);
}
/* Stencil mask uv layer name. */
/* Stencil mask layer name. */
if (i == CustomData_get_stencil_layer(data, cl->type)) {
BLI_snprintf(attr_name, sizeof(attr_name), "m%s", base_name);
GPU_vertformat_alias_add(format, attr_name);

4
source/blender/editors/object/object_modifier.c
View File

@ -786,7 +786,7 @@ static bool modifier_apply_obdata(
Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
Curve *curve = ob->data;
Curve *curve_eval = (Curve *)object_eval->data;
ModifierEvalContext mectx = {depsgraph, object_eval, 0, false};
ModifierEvalContext mectx = {depsgraph, object_eval, 0};
if (ELEM(mti->type, eModifierTypeType_Constructive, eModifierTypeType_Nonconstructive)) {
BKE_report(
@ -810,7 +810,7 @@ static bool modifier_apply_obdata(
else if (ob->type == OB_LATTICE) {
Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
Lattice *lattice = ob->data;
ModifierEvalContext mectx = {depsgraph, object_eval, 0, false};
ModifierEvalContext mectx = {depsgraph, object_eval, 0};
if (ELEM(mti->type, eModifierTypeType_Constructive, eModifierTypeType_Nonconstructive)) {
BKE_report(reports, RPT_ERROR, "Constructive modifiers cannot be applied");