archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GP: Cleanup style

Browse Source
This commit is contained in:
Antonio Vazquez
2018-10-15 08:35:11 +02:00
parent 4479813ae5
commit 918bb05799
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
View File

@@ -102,7 +102,7 @@ tGPencilObjectCache *gpencil_object_cache_add(
memset(cache_elem, 0, sizeof(*cache_elem));
cache_elem->is_dup_ob = gpencil_check_ob_duplicated(cache_array, *gp_cache_used, ob);
STRNCPY(cache_elem->ob_name, ob->id.name);
cache_elem->gpd = (bGPdata *)ob->data;
@@ -156,7 +156,7 @@ tGPencilObjectCache *gpencil_object_cache_add(
/* get current cache data */
static GpencilBatchCache *gpencil_batch_get_element(Object *ob)
{
bGPdata *gpd = ob->data;
bGPdata *gpd = (bGPdata *)ob->data;
if (gpd->runtime.batch_cache_data == NULL) {
gpd->runtime.batch_cache_data = BLI_ghash_str_new("GP batch cache data");
return NULL;

33
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@@ -506,37 +506,24 @@ static void gpencil_add_draw_data(void *vedata, Object *ob)
int i = stl->g_data->gp_cache_used - 1;
tGPencilObjectCache *cache_ob = &stl->g_data->gp_object_cache[i];
if (cache_ob->is_dup_ob == false) {
/* save init shading group */
cache_ob->init_grp = stl->storage->shgroup_id;
/* save init shading group */
cache_ob->init_grp = stl->storage->shgroup_id;
/* fill shading groups */
if (!is_multiedit) {
DRW_gpencil_populate_datablock(&e_data, vedata, scene, ob, cache_ob);
}
else {
DRW_gpencil_populate_multiedit(&e_data, vedata, scene, ob, cache_ob);
}
/* save end shading group */
cache_ob->end_grp = stl->storage->shgroup_id - 1;
/* fill shading groups */
if ((!is_multiedit) || (cache_ob->is_dup_ob)) {
DRW_gpencil_populate_datablock(&e_data, vedata, scene, ob, cache_ob);
}
else {
/* save init shading group */
cache_ob->init_grp = stl->storage->shgroup_id;
DRW_gpencil_populate_datablock(
&e_data, vedata, scene, ob,
cache_ob);
/* save end shading group */
cache_ob->end_grp = stl->storage->shgroup_id - 1;
DRW_gpencil_populate_multiedit(&e_data, vedata, scene, ob, cache_ob);
}
/* save end shading group */
cache_ob->end_grp = stl->storage->shgroup_id - 1;
/* FX passses */
cache_ob->has_fx = false;
if ((!stl->storage->simplify_fx) &&
(BKE_shaderfx_has_gpencil(ob)))
(BKE_shaderfx_has_gpencil(ob)))
{
cache_ob->has_fx = true;
if ((!stl->storage->simplify_fx) && (!is_multiedit)) {