blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

GPv3: Opacity modifier #116946

Merged
Lukas Tönne merged 52 commits from LukasTonne/blender:gp3-opacity-modifier into main 2024-01-16 16:56:22 +01:00
Conversation 8 Commits 52 Files Changed 11 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c45f62887 - Show all commits

6
source/blender/makesrna/intern/rna_modifier.cc
View File

@ -679,7 +679,7 @@ const EnumPropertyItem rna_enum_subdivision_boundary_smooth_items[] = {
# include "BKE_cachefile.h"
# include "BKE_context.hh"
# include "BKE_deform.h"
# include "BKE_grease_pencil.hh"
# include "BKE_material.h"
# include "BKE_mesh_runtime.hh"
# include "BKE_modifier.hh"
# include "BKE_object.hh"
@ -1718,7 +1718,7 @@ bool rna_GreasePencilModifier_material_poll(PointerRNA *ptr, PointerRNA value)
Object *ob = reinterpret_cast<Object *>(ptr->owner_id);
Material *ma = reinterpret_cast<Material *>(value.owner_id);
return BKE_grease_pencil_object_material_index_get(ob, ma) != -1;
return BKE_object_material_index_get(ob, ma) != -1;
}
/* Write material to a generic target pointer without the final modifier struct. */
@ -1730,7 +1730,7 @@ static void rna_GreasePencilModifier_material_set(PointerRNA *ptr,
Object *ob = reinterpret_cast<Object *>(ptr->owner_id);
Material *ma = reinterpret_cast<Material *>(value.owner_id);
if (ma == nullptr || BKE_grease_pencil_object_material_index_get(ob, ma) != -1) {
if (ma == nullptr || BKE_object_material_index_get(ob, ma) != -1) {
id_lib_extern(reinterpret_cast<ID *>(ob));
*ma_target = ma;
}

2
source/blender/modifiers/intern/MOD_grease_pencil_util.cc
View File

@ -261,7 +261,7 @@ static IndexMask get_filtered_stroke_mask(const Object *ob,
return full_mask;
}
const int material_filter_index = BKE_grease_pencil_object_material_index_get(
const int material_filter_index = BKE_object_material_index_get(
const_cast<Object *>(ob), const_cast<Material *>(material_filter));
const Vector<int> material_pass_by_index = get_grease_pencil_material_passes(ob);